update fixtures and tests for merge

test/fixtures/transaction.json

@@ -65,6 +65,11 @@
         "version": 1,
         "locktime": 0,
         "ins": [
+          {
+            "hash": "2afdde042a49d7cf5c34c9ec2331049bb8cbc5841d7324748eab52bf10dfb954",
+            "index": 1,
+            "script": null
+          },
           {
             "hash": "e7b73e229790c1e79a02f0c871813b3cf26a4156c5b8d942e88b38fe8d3f43a0",
             "index": 0,

test/transaction.js

@@ -117,7 +117,7 @@ describe('Transaction', function() {
           var script = txIn.script ? Script.fromASM(txIn.script) : undefined
           var j = tx.addInput(txHash, txIn.index, txIn.sequence, script)
           var sequence = txIn.sequence
-          if (sequence === undefined) {
+          if (sequence === undefined || sequence === null ) {
             sequence = Transaction.DEFAULT_SEQUENCE
           }