Merge branch '2017_optin_replay' of git://github.com/jcansdale/bitcoi…

…n into 2017_optin_replay_jcansdale
btc1 · Oct 4, 2017 · a3c4125 · a3c4125 · ebliever · Oct 4, 2017
2 parents 28ebbdb + fdc49fb
commit a3c4125
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 3 deletions.
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
@@ -157,6 +157,11 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason, const bool witnes
         return false;
     }
 
+    if (tx.ReplayProtected()) {
+        reason = "replay-protected";
+        return false;
+    }
+
     return true;
 }
 

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -113,3 +113,18 @@ std::string CTransaction::ToString() const
         str += "    " + tx_out.ToString() + "\n";
     return str;
 }
+
+bool CTransaction::ReplayProtected() const
+{
+	// scriptAddress: 3Bit1xA4apyzgmFNT2k8Pvnd6zb6TnwcTi, scriptSig: 04148f33be, scriptPubKey: OP_HASH160 6e0b7d51f9f68ba28cc33a6844d41a1880c58a19 OP_EQUAL
+    static const CScript noReplay =
+        CScript() << OP_HASH160 << ParseHex("6e0b7d51f9f68ba28cc33a6844d41a1880c58a19") << OP_EQUAL;
+
+    for (const auto& txout : this->vout) {
+        if (txout.scriptPubKey == noReplay) {
+            return true;
+        }
+    }
+    return false;
+}
+
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -347,6 +347,8 @@ class CTransaction
 
     std::string ToString() const;
 
+    bool ReplayProtected() const;
+
     bool HasWitness() const
     {
         for (size_t i = 0; i < vin.size(); i++) {

diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
@@ -797,6 +797,28 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
     t.vout[0].scriptPubKey = CScript() << OP_RETURN;
     t.vout[1].scriptPubKey = CScript() << OP_RETURN;
     BOOST_CHECK(!IsStandardTx(t, reason));
+
+	// scriptAddress: 3Bit1xA4apyzgmFNT2k8Pvnd6zb6TnwcTi, scriptSig: 04148f33be, scriptPubKey: OP_HASH160 6e0b7d51f9f68ba28cc33a6844d41a1880c58a19 OP_EQUAL
+    t.vout.resize(1);
+    t.vout[0].scriptPubKey = CScript() << OP_HASH160 << ParseHex("6e0b7d51f9f68ba28cc33a6844d41a1880c58a19") << OP_EQUAL;
+    BOOST_CHECK(!IsStandardTx(t, reason));
+}
+
+BOOST_AUTO_TEST_CASE(test_ReplayProtected)
+{
+    CMutableTransaction t;
+
+	// scriptAddress: 3Bit1xA4apyzgmFNT2k8Pvnd6zb6TnwcTi, scriptSig: 04148f33be, scriptPubKey: OP_HASH160 6e0b7d51f9f68ba28cc33a6844d41a1880c58a19 OP_EQUAL
+    t.vout.resize(1);
+    t.vout[0].scriptPubKey = CScript() << OP_HASH160 << ParseHex("6e0b7d51f9f68ba28cc33a6844d41a1880c58a19") << OP_EQUAL;
+    CTransaction tx1(t);
+    BOOST_CHECK(tx1.ReplayProtected());	
+
+	// scriptAddress: 3EZT2iZWYCpy1uXX6XtjX429TnsZ3vKvVV, scriptSig: 777777, scriptPubKey: OP_HASH160 8d2b43ea8081126af5bc392612b1471a0c4fe503 OP_EQUAL
+    t.vout.resize(1);
+    t.vout[0].scriptPubKey = CScript() << OP_HASH160 << ParseHex("8d2b43ea8081126af5bc392612b1471a0c4fe503") << OP_EQUAL;
+    CTransaction tx2(t);
+    BOOST_CHECK(!tx2.ReplayProtected());	
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3063,6 +3063,9 @@ static bool ContextualCheckBlock(const CBlock& block, CValidationState& state, c
     for (const auto& tx : block.vtx)
     {
         nSigOps += GetLegacySigOpCount(*tx);
+
+        if (fSegwitSeasoned && tx->ReplayProtected())
+            return state.DoS(100, false, REJECT_INVALID, "bad-blk-rptx", false, "replay-protected tx in block");
     }
     if (nSigOps * WITNESS_SCALE_FACTOR > MaxBlockSigOpsCost(fSegwitSeasoned))
         return state.DoS(100, false, REJECT_INVALID, "bad-blk-sigops", false, "out-of-bounds SigOpCount");

diff --git a/test/functional/fork-large-block.py b/test/functional/fork-large-block.py
@@ -180,15 +180,23 @@ def run_test(self):
         # Test hard fork at block 1583
         assert_equal(self.height, 584)
 
-        b = [self.nodes[0].getblockhash(n) for n in range(1, 10)]
+        b = [self.nodes[0].getblockhash(n) for n in range(1, 11)]
         txids = [self.nodes[0].getblock(h)['tx'][0] for h in b]
         spend_tx = [FromHex(CTransaction(), self.nodes[0].getrawtransaction(txid)) for txid in txids]
         for tx in spend_tx:
             tx.rehash()
-        large_tx = [self.create_tx(t, 0, 1, length=500000) for t in spend_tx]
 
-        self.generate_blocks(998, 4)
+        spend_tx_extra = spend_tx[:1]
+        spend_tx_large = spend_tx[1:]
 
+        large_tx = [self.create_tx(t, 0, 1, length=500000) for t in spend_tx_large]
+
+		# P2SH: 3Bit1xA4apyzgmFNT2k8Pvnd6zb6TnwcTi
+        noreplay_tx = self.create_tx(spend_tx_extra[0], 0, 0, CScript([OP_HASH160, hex_str_to_bytes("6e0b7d51f9f68ba28cc33a6844d41a1880c58a19"), OP_EQUAL]))
+
+        self.generate_blocks(997, 4)
+
+        self.generate_blocks(1, 4, txs=[noreplay_tx]) # noreplay-tx is ok
         self.generate_blocks(1, 4, "bad-blk-length", txs=[large_tx[0], large_tx[1]]) # block too large
         self.generate_blocks(1, 4, txs=[large_tx[0]]) # large txs is ok
 
@@ -207,6 +215,7 @@ def run_test(self):
         assert_equal(self.height, 6584)
 
         self.generate_blocks(1, 4, txs=[large_tx[4], large_tx[5], large_tx[6]]) # large block ok
+        self.generate_blocks(1, 4, "bad-blk-rptx", txs=[noreplay_tx]) # noreplay-tx is invalid after the fork
 
 
     def generate_blocks(self, number, version, error = None, txs = []):