Merge remote-tracking branch 'origin' into abcfallback

stckwok · Mar 20, 2018 · 8a7bb42 · 8a7bb42
2 parents 6f653e9 + 9556150
commit 8a7bb42
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -65,6 +65,20 @@ Alternatively, you may also follow steps 4 to 8 to manually fallback to the ABC
         $ git checkout master && git pull --ff origin master
 	```
 
+    Note: If you encounter following error message due to access permission on ABC development branch. Please execute the script on next step.
+
+	```
+        Cloning into 'abc'...
+        fatal: unable to access 'https://reviews.bitcoinabc.org/source/bitcoin-abc.git/': gnutls_handshake() failed: Error in the pull function.
+        fatal: clone of 'https://reviews.bitcoinabc.org/source/bitcoin-abc.git' into submodule path 'abc' failed
+	```
+
+3. Execute the following step to fallback to the master branch of ABC in github
+
+	```
+	$ ./update-submodules.sh
+	```
+
 Dependencies
 =====================
 Make sure all package dependencies are installed (see Quick installation instructions section in [BitcoinUnlimited](https://github.com/BitcoinUnlimited/BitcoinUnlimited)). 

diff --git a/abc b/abc
diff --git a/bucash b/bucash
diff --git a/test/forkMay2018.py b/test/forkMay2018.py
@@ -19,6 +19,8 @@
 from test_framework.util import *
 from test_framework.blocktools import *
 from interopUtils import *
+from test_framework.key import CECKey
+from test_framework.script import *
 import interopNodes
 
 def verify_chain_tip(self, nodeId):
@@ -35,6 +37,15 @@ def verify_chain_tip(self, nodeId):
     assert_equal(tips[0]['branchlen'], 0)
     assert_equal(tips[0]['status'], 'active')
 
+def p2sh(btcAddress):
+    """ create a pay-to-script-hash script"""
+    private_key = CECKey()
+    private_key.set_secretbytes(b"helloworld")
+    public_key = private_key.get_pubkey()
+    redeem_script = CScript([public_key] + [ OP_2DUP, OP_CHECKSIGVERIFY] * 5 + [OP_CHECKSIG])
+    redeem_script_hash = hash160(redeem_script)
+    p2sh_script = CScript([OP_HASH160, redeem_script_hash, OP_EQUAL])
+    return p2sh_script
 
 class ForkMay2018(BitcoinTestFramework):
     def __init__(self, build_variant, client_dirs, bitcoinConfDict):
@@ -70,6 +81,7 @@ def run_test(self):
         self.preTestOpReturn()
         self.initiateFork()
         self.testOpReturn()
+        self.testOpP2SH()
         reporter.display_report()
 
     def initiateFork(self):
@@ -78,8 +90,12 @@ def initiateFork(self):
         self.nodes[0].generate(20)
         self.sync_blocks()
 
+    def emptyMemPool(self):
+        self.nodes[0].generate(1)
+        # mempool should be empty, all txns confirmed
+        assert_equal(set(self.nodes[0].getrawmempool()), set())
 
-    def generateTx(self, node, addrs, data=None):
+    def generateTx(self, node, addrs, data=None, script=p2pkh):
         FEE = decimal.Decimal("0.0001")
         wallet = node.listunspent()
         wallet.sort(key=lambda x: x["amount"], reverse=False)
@@ -99,7 +115,7 @@ def generateTx(self, node, addrs, data=None):
                 outp[addrs[x]] = payamt
             if data:
                 outp["data"] = data
-            txn = createrawtransaction([utxo], outp, p2pkh)
+            txn = createrawtransaction([utxo], outp, script)
             #txn = createrawtransaction([utxo], outp, createWastefulOutput)
             signedtxn = node.signrawtransaction(txn)
             size += len(binascii.unhexlify(signedtxn["hex"]))
@@ -144,6 +160,31 @@ def testOpReturn(self):
             assert [ x.getconnectioncount() for x in self.nodes] == cnxns # make sure nobody dropped or banned
             count += 1
 
+    @assert_capture()
+    def testOpP2SH(self):
+        cnxns = [ x.getconnectioncount() for x in self.nodes]
+        addrsbch = [ x.getnewaddress() for x in self.nodes]
+        addrs = [ self.nodes[0].getaddressforms(x)["legacy"] for x in addrsbch]  # TODO handle bitcoincash addrs in python
+        count=1
+        #clean up mempool before testing
+        self.emptyMemPool()
+        # for each node: create a txn that spends to that P2SH.
+        for n in self.nodes:
+            tx = self.generateTx(n, addrs, hexlify(("*"*2).encode("utf-8")), p2sh)  #p2sh
+            mp = [0]*4
+            tries = 10
+            while mp != [count]*4 and tries > 0:
+                tries -= 1
+                time.sleep(1) # wait for tx to sync
+                mp = [ x.getmempoolinfo()["size"] for x in self.nodes]
+            print("memory pools are %s" % str(mp))
+            assert mp == [count]*4, "transaction was not relayed to all nodes %s" % str(mp)
+            assert [ x.getconnectioncount() for x in self.nodes] == cnxns # make sure nobody dropped or banned
+            count += 1
+        # mine a block and verify that all nodes accept it
+        self.nodes[0].generate(1)
+        sync_blocks(self.nodes)
+        logging.info("mempool counts: %s" % [ x.getmempoolinfo()["size"] for x in self.nodes])
 
 def Test():
     bitcoinConf = {

diff --git a/xt b/xt
+4 −1		src/allowed_args.cpp
+14 −1		src/chainparams.cpp
+1 −1		src/chainparams.h
+2 −0		src/consensus/params.h
+1 −1		src/globals.cpp
+3 −2		src/init.cpp
+6 −22		src/main.cpp
+0 −1		src/main.h
+28 −0		src/requestManager.cpp
+9 −0		src/requestManager.h
+1 −1		src/rpc/blockchain.cpp
+11 −14		README.md
+0 −1		qa/pull-tester/rpc-tests.py
+0 −115		qa/rpc-tests/32mb-bump.py
+5 −7		qa/rpc-tests/p2p-compactblocks.py
+0 −2		src/consensus/consensus.h
+1 −1		src/init.cpp
+6 −19		src/main.cpp
+5 −17		src/maxblocksize.cpp
+2 −2		src/maxblocksize.h
+0 −12		src/options.cpp
+0 −1		src/options.h
+5 −54		src/test/maxblocksize_tests.cpp
+0 −16		src/test/options_tests.cpp
+1 −39		src/test/utilfork_tests.cpp
+5 −7		src/test/xthin_tests.cpp
+5 −24		src/utilfork.cpp
+0 −2		src/utilfork.h
+3 −5		src/xthin.cpp