Update cbTx with merkleroot of quorum commitments

Author: Cofresi

lib/transaction/payload/coinbasepayload.js

@@ -19,13 +19,15 @@ var HASH_SIZE = constants.SHA256_HASH_SIZE;
  * @property {number} version
  * @property {number} height
  * @property {string} merkleRootMNList
+ * @property {string} merkleRootQuorums
  */
 
 /**
  * @class CoinbasePayload
  * @property {number} version
  * @property {number} height
  * @property {string} merkleRootMNList
+ * @property {string} merkleRootQuorums
  */
 function CoinbasePayload() {
   AbstractPayload.call(this);
@@ -48,6 +50,9 @@ CoinbasePayload.fromBuffer = function (rawPayload) {
   payload.version = payloadBufferReader.readUInt16LE();
   payload.height = payloadBufferReader.readUInt32LE();
   payload.merkleRootMNList = payloadBufferReader.read(HASH_SIZE).reverse().toString('hex');
+  if (payload.version >= 2) {
+    payload.merkleRootQuorums = payloadBufferReader.read(HASH_SIZE).reverse().toString('hex');
+  }
 
   if (!payloadBufferReader.finished()) {
     throw new Error('Failed to parse payload: raw payload is bigger than expected.');
@@ -67,6 +72,9 @@ CoinbasePayload.fromJSON = function fromJSON(payloadJson) {
   payload.version = payloadJson.version;
   payload.height = payloadJson.height;
   payload.merkleRootMNList = payloadJson.merkleRootMNList;
+  if (payload.version >= 2) {
+    payload.merkleRootQuorums = payloadJson.merkleRootQuorums;
+  }
 
   payload.validate();
   return payload;
@@ -83,6 +91,10 @@ CoinbasePayload.prototype.validate = function() {
   Preconditions.checkArgument(isUnsignedInteger(this.height), 'Expect height to be an unsigned integer');
   Preconditions.checkArgument(isHexString(this.merkleRootMNList), 'expect merkleRootMNList to be a hex string but got ' + typeof this.merkleRootMNList);
   Preconditions.checkArgument(this.merkleRootMNList.length === constants.SHA256_HASH_SIZE * 2, 'Invalid merkleRootMNList size');
+  if (this.version >= 2) {
+    Preconditions.checkArgument(isHexString(this.merkleRootQuorums), 'expect merkleRootQuorums to be a hex string but got ' + typeof this.merkleRootQuorums);
+    Preconditions.checkArgument(this.merkleRootQuorums.length === constants.SHA256_HASH_SIZE * 2, 'Invalid merkleRootQuorums size');
+  }
   return true;
 };
 
@@ -92,11 +104,15 @@ CoinbasePayload.prototype.validate = function() {
  */
 CoinbasePayload.prototype.toJSON = function toJSON() {
   this.validate();
-  return {
+  const json = {
     version: this.version,
     height: this.height,
-    merkleRootMNList: this.merkleRootMNList
+    merkleRootMNList: this.merkleRootMNList,
   };
+  if (this.version >= 2) {
+    json.merkleRootQuorums = this.merkleRootQuorums
+  }
+  return json;
 };
 
 /**
@@ -112,6 +128,10 @@ CoinbasePayload.prototype.toBuffer = function toBuffer() {
     .writeUInt32LE(this.height)
     .write(Buffer.from(this.merkleRootMNList, 'hex').reverse());
 
+  if (this.version >= 2) {
+    payloadBufferWriter.write(Buffer.from(this.merkleRootQuorums, 'hex').reverse());
+  }
+
   return payloadBufferWriter.toBuffer();
 };