add pegin_witness to witness inputs

instagibbs · instagibbs · commit 16973cd1d2e0 · 2017-11-06T10:13:28.000-05:00
diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -97,29 +97,18 @@ CMutableTransaction::CMutableTransaction() : nVersion(CTransaction::CURRENT_VERS
 CMutableTransaction::CMutableTransaction(const CTransaction& tx) : nVersion(tx.nVersion), vin(tx.vin), vout(tx.vout), wit(tx.wit), nLockTime(tx.nLockTime) {}
 
 /**
- * The input witness consists of three elements, two of which are
+ * The input witness consists of four elements, three of which are
  * optional. The optional elements have to do with asset issuance
- * and are not normally present, most of the time. For this reason
- * the optional elements are places in a lower branch of the Merkle
- * tree. When not present, they take on constant values in the hash
- * tree.
+ * and peg-in transactions, nor present most of the time.
  *
- *     S : script witness
- *     A : issuance amount rangeproof
- *     I : inflation keys rangeproof
- *
- *             .
- *            / \
- *           .   S
- *          / \
- *         A   I
- */
+  */
 uint256 CTxInWitness::GetHash() const
 {
     std::vector<uint256> leaves;
     leaves.push_back(SerializeHash(vchIssuanceAmountRangeproof, SER_GETHASH, 0));
     leaves.push_back(SerializeHash(vchInflationKeysRangeproof, SER_GETHASH, 0));
     leaves.push_back(SerializeHash(scriptWitness.stack, SER_GETHASH, 0));
+    leaves.push_back(SerializeHash(m_pegin_witness.stack, SER_GETHASH, 0));
     return ComputeFastMerkleRoot(leaves);
 }
 
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -509,9 +509,12 @@ class CTxIn
 class CTxInWitness
 {
 public:
+    // TODO generalize CScriptWitness into just CWitness
     std::vector<unsigned char> vchIssuanceAmountRangeproof;
     std::vector<unsigned char> vchInflationKeysRangeproof;
     CScriptWitness scriptWitness;
+    // Re-use script witness struct to include its own witness
+    CScriptWitness m_pegin_witness;
 
     ADD_SERIALIZE_METHODS;
 
@@ -521,19 +524,21 @@ class CTxInWitness
         READWRITE(vchIssuanceAmountRangeproof);
         READWRITE(vchInflationKeysRangeproof);
         READWRITE(scriptWitness.stack);
+        READWRITE(m_pegin_witness.stack);
     }
 
     CTxInWitness() { }
 
     bool IsNull() const
     {
-        return vchIssuanceAmountRangeproof.empty() && vchInflationKeysRangeproof.empty() && scriptWitness.IsNull();
+        return vchIssuanceAmountRangeproof.empty() && vchInflationKeysRangeproof.empty() && scriptWitness.IsNull() && m_pegin_witness.IsNull();
     }
     void SetNull()
     {
         vchIssuanceAmountRangeproof.clear();
         vchInflationKeysRangeproof.clear();
         scriptWitness.stack.clear();
+        m_pegin_witness.stack.clear();
     }
 
     uint256 GetHash() const;
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp

Original file line number	Diff line number	Diff line change
`@@ -509,9 +509,12 @@ class CTxIn`
`509`	`509`	`class CTxInWitness`
`510`	`510`	`{`
`511`	`511`	`public:`
	`512`	`+ // TODO generalize CScriptWitness into just CWitness`
`512`	`513`	`std::vector<unsigned char> vchIssuanceAmountRangeproof;`
`513`	`514`	`std::vector<unsigned char> vchInflationKeysRangeproof;`
`514`	`515`	`CScriptWitness scriptWitness;`
	`516`	`+ // Re-use script witness struct to include its own witness`
	`517`	`+ CScriptWitness m_pegin_witness;`
`515`	`518`
`516`	`519`	`ADD_SERIALIZE_METHODS;`
`517`	`520`
`@@ -521,19 +524,21 @@ class CTxInWitness`
`521`	`524`	`READWRITE(vchIssuanceAmountRangeproof);`
`522`	`525`	`READWRITE(vchInflationKeysRangeproof);`
`523`	`526`	`READWRITE(scriptWitness.stack);`
	`527`	`+ READWRITE(m_pegin_witness.stack);`
`524`	`528`	`}`
`525`	`529`
`526`	`530`	`CTxInWitness() { }`
`527`	`531`
`528`	`532`	`bool IsNull() const`
`529`	`533`	`{`
`530`		`- return vchIssuanceAmountRangeproof.empty() && vchInflationKeysRangeproof.empty() && scriptWitness.IsNull();`
	`534`	`+ return vchIssuanceAmountRangeproof.empty() && vchInflationKeysRangeproof.empty() && scriptWitness.IsNull() && m_pegin_witness.IsNull();`
`531`	`535`	`}`
`532`	`536`	`void SetNull()`
`533`	`537`	`{`
`534`	`538`	`vchIssuanceAmountRangeproof.clear();`
`535`	`539`	`vchInflationKeysRangeproof.clear();`
`536`	`540`	`scriptWitness.stack.clear();`
	`541`	`+ m_pegin_witness.stack.clear();`
`537`	`542`	`}`
`538`	`543`
`539`	`544`	`uint256 GetHash() const;`