Support DIP2 special txes

UdjinM6 · UdjinM6 · commit 69807fd8dd76 · 2018-12-01T21:39:47.000+03:00
diff --git a/src/transaction.js b/src/transaction.js
@@ -23,9 +23,11 @@ function vectorSize (someVector) {
 
 function Transaction () {
   this.version = 1
+  this.type = 0
   this.locktime = 0
   this.ins = []
   this.outs = []
+  this.extrapayload = []
 }
 
 Transaction.DEFAULT_SEQUENCE = 0xffffffff
@@ -59,9 +61,9 @@ Transaction.fromBuffer = function (buffer, __noStrict) {
     return i
   }
 
-  function readInt32 () {
-    const i = buffer.readInt32LE(offset)
-    offset += 4
+  function readInt16 () {
+    const i = buffer.readInt16LE(offset)
+    offset += 2
     return i
   }
 
@@ -89,7 +91,8 @@ Transaction.fromBuffer = function (buffer, __noStrict) {
   }
 
   const tx = new Transaction()
-  tx.version = readInt32()
+  tx.version = readInt16()
+  tx.type = readInt16()
 
   const marker = buffer.readUInt8(offset)
   const flag = buffer.readUInt8(offset + 1)
@@ -131,6 +134,10 @@ Transaction.fromBuffer = function (buffer, __noStrict) {
 
   tx.locktime = readUInt32()
 
+  if (tx.version === 3) {
+    tx.extrapayload = readVarSlice()
+  }
+
   if (__noStrict) return tx
   if (offset !== buffer.length) throw new Error('Transaction has unexpected data')
 
@@ -214,13 +221,15 @@ Transaction.prototype.__byteLength = function (__allowWitness) {
     varuint.encodingLength(this.outs.length) +
     this.ins.reduce(function (sum, input) { return sum + 40 + varSliceSize(input.script) }, 0) +
     this.outs.reduce(function (sum, output) { return sum + 8 + varSliceSize(output.script) }, 0) +
-    (hasWitnesses ? this.ins.reduce(function (sum, input) { return sum + vectorSize(input.witness) }, 0) : 0)
+    (hasWitnesses ? this.ins.reduce(function (sum, input) { return sum + vectorSize(input.witness) }, 0) : 0) +
+    (this.version === 3 ? varSliceSize(this.extrapayload) : 0)
   )
 }
 
 Transaction.prototype.clone = function () {
   const newTx = new Transaction()
   newTx.version = this.version
+  newTx.type = this.type
   newTx.locktime = this.locktime
 
   newTx.ins = this.ins.map(function (txIn) {
@@ -240,6 +249,8 @@ Transaction.prototype.clone = function () {
     }
   })
 
+  newTx.extrapayload = this.extrapayload
+
   return newTx
 }
 
@@ -422,7 +433,7 @@ Transaction.prototype.__toBuffer = function (buffer, initialOffset, __allowWitne
   function writeSlice (slice) { offset += slice.copy(buffer, offset) }
   function writeUInt8 (i) { offset = buffer.writeUInt8(i, offset) }
   function writeUInt32 (i) { offset = buffer.writeUInt32LE(i, offset) }
-  function writeInt32 (i) { offset = buffer.writeInt32LE(i, offset) }
+  function writeInt16 (i) { offset = buffer.writeInt16LE(i, offset) }
   function writeUInt64 (i) { offset = bufferutils.writeUInt64LE(buffer, i, offset) }
   function writeVarInt (i) {
     varuint.encode(i, buffer, offset)
@@ -431,7 +442,8 @@ Transaction.prototype.__toBuffer = function (buffer, initialOffset, __allowWitne
   function writeVarSlice (slice) { writeVarInt(slice.length); writeSlice(slice) }
   function writeVector (vector) { writeVarInt(vector.length); vector.forEach(writeVarSlice) }
 
-  writeInt32(this.version)
+  writeInt16(this.version)
+  writeInt16(this.type)
 
   const hasWitnesses = __allowWitness && this.hasWitnesses()
 
@@ -468,6 +480,10 @@ Transaction.prototype.__toBuffer = function (buffer, initialOffset, __allowWitne
 
   writeUInt32(this.locktime)
 
+  if (this.version === 3) {
+    writeVarSlice(this.extrapayload)
+  }
+
   // avoid slicing unless necessary
   if (initialOffset !== undefined) return buffer.slice(initialOffset, offset)
   return buffer
diff --git a/test/fixtures/transaction.json b/test/fixtures/transaction.json
@@ -185,6 +185,25 @@
       "virtualSize": 126,
       "weight": 504
     },
+    {
+      "description": "Quorum special transaction",
+      "id": "f96ca72497c5ad795e8a4d1c840ebc1e5804f75171f73e6df4b3dc010e21c50c",
+      "hash": "0cc5210e01dcb3f46d3ef77151f704581ebc0e841c4d8a5e79adc59724a76cf9",
+      "hex": "03000600000000000000fd490101007a2e0400010001e58d0b7e02ba7b56cbfe89a92b5cfd644b1be005a53884b405a5e70000000000320000000000000032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "raw": {
+        "version": 3,
+        "type": 6,
+        "ins": [
+        ],
+        "outs": [
+        ],
+        "locktime": 0,
+        "extrapayload": "01007a2e0400010001e58d0b7e02ba7b56cbfe89a92b5cfd644b1be005a53884b405a5e70000000000320000000000000032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      },
+      "coinbase": false,
+      "virtualSize": 342,
+      "weight": 1368
+    },
     {
       "description": "Transaction that ignores script chunking rules - Bug #367",
       "id": "ebc9fa1196a59e192352d76c0f6e73167046b9d37b8302b6bb6968dfd279b767",
diff --git a/test/transaction.js b/test/transaction.js
@@ -8,6 +8,7 @@ describe('Transaction', function () {
   function fromRaw (raw, noWitness) {
     const tx = new Transaction()
     tx.version = raw.version
+    tx.type = raw.type
     tx.locktime = raw.locktime
 
     raw.ins.forEach(function (txIn, i) {
@@ -43,6 +44,10 @@ describe('Transaction', function () {
       tx.addOutput(script, txOut.value)
     })
 
+    if (tx.version === 3) {
+      tx.extrapayload = Buffer.from(raw.extrapayload, 'hex')
+    }
+
     return tx
   }
 
