bitcoinconsensus stubs updated, and target v3.0.0

Author: Thomas Kerin

.travis.yml

@@ -65,7 +65,7 @@ install:
             sudo cp ${HOME}/bitcoin/bitcoin-${BITCOIN_VERSION}/lib/libbitcoinconsensus.so.0.0.0 /usr/lib &&
             sudo ln -s /usr/lib/libbitcoinconsensus.so.0.0.0 /usr/lib/libbitcoinconsensus.so &&
             sudo ln -s /usr/lib/libbitcoinconsensus.so.0.0.0 /usr/lib/libbitcoinconsensus.so.0 &&
-            git clone -b v2.0.0 https://github.com/Bit-Wasp/bitcoinconsensus-php &&
+            git clone -b v3.0.0 https://github.com/Bit-Wasp/bitcoinconsensus-php &&
             cd bitcoinconsensus-php/bitcoinconsensus &&
             phpize && ./configure --with-bitcoinconsensus &&
             make && sudo make install && cd ../..;

composer.json

@@ -37,6 +37,7 @@
     "ext-json": "*",
     "phpunit/phpunit": "^5.4.0",
     "squizlabs/php_codesniffer": "^2.0.0",
-    "nbobtc/bitcoind-php": "v2.0.2"
+    "nbobtc/bitcoind-php": "v2.0.2",
+    "bitwasp/bitcoinconsensus": "v3.0.0"
   }
 }

src/Script/Consensus/BitcoinConsensus.php

@@ -22,7 +22,7 @@ class BitcoinConsensus implements ConsensusInterface
      */
     public function verify(TransactionInterface $tx, ScriptInterface $scriptPubKey, int $flags, int $nInputToSign, int $amount): bool
     {
-        if ($flags !== ($flags & BITCOINCONSENSUS_VERIFY_ALL)) {
+        if ($flags !== ($flags & BITCOINCONSENSUS_SCRIPT_FLAGS_VERIFY_ALL)) {
             throw new BitcoinConsensusException("Invalid flags for bitcoinconsensus");
         }
 

stubs/BitcoinConsensusStubs.php

@@ -1,48 +1,4 @@
 <?php
 
-namespace {
-    define("BITCOINCONSENSUS_VERIFY_NONE", 0);
-    define("BITCOINCONSENSUS_VERIFY_P2SH", 1 << 0);
-    define("BITCOINCONSENSUS_VERIFY_STRICTENC", 1 << 1);
-    define("BITCOINCONSENSUS_VERIFY_DERSIG", 1 << 2);
-    define("BITCOINCONSENSUS_VERIFY_LOW_S", 1 << 3);
-    define("BITCOINCONSENSUS_VERIFY_NULLDUMMY", 1 << 4);
-    define("BITCOINCONSENSUS_VERIFY_SIGPUSHONLY", 1 << 5);
-    define("BITCOINCONSENSUS_VERIFY_MINIMALDATA", 1 << 6);
-    define("BITCOINCONSENSUS_VERIFY_DISCOURAGE_UPGRADABLE_NOPS", 1 << 7);
-    define("BITCOINCONSENSUS_VERIFY_CLEANSTACK", 1 << 8);
-    define("BITCOINCONSENSUS_VERIFY_CHECKLOCKTIMEVERIFY", 1 << 9);
-    define("BITCOINCONSENSUS_VERIFY_WITNESS", 1 << 10);
-
-    /**
-     * @return int
-     */
-    function bitcoinconsensus_version() {
-    }
-
-    /**
-     * @param string $scriptPubKey
-     * @param int $amount
-     * @param string $transaction
-     * @param int $nInput
-     * @param int $flags
-     * @param int $error
-     * @return bool
-     */
-    function bitcoinconsensus_verify_script_with_amount($scriptPubKey, $amount, $transaction, $nInput, $flags, &$error) {
-
-    }
-
-    /**
-     * @param string $scriptPubKey
-     * @param string $transaction
-     * @param int $nInput
-     * @param int $flags
-     * @param int $error
-     * @return bool
-     */
-    function bitcoinconsensus_verify_script($scriptPubKey, $transaction, $nInput, $flags, &$error) {
-
-    }
-}
-
+require "../vendor/bitwasp/bitcoinconsensus/stubs/const.php";
+require "../vendor/bitwasp/bitcoinconsensus/stubs/functions.php";

tests/Script/BitcoinConsensusTest.php

@@ -16,7 +16,7 @@ public function testOptionalCheckScriptFlags()
     {
         if (extension_loaded('bitcoinconsensus')) {
             $flags = 1 | 3 | 2 | 65;
-            $check = $flags == ($flags & BITCOINCONSENSUS_VERIFY_ALL);
+            $check = $flags == ($flags & BITCOINCONSENSUS_SCRIPT_FLAGS_VERIFY_ALL);
             $this->assertFalse($check);
 
             $c = new BitcoinConsensus();

tests/Script/ConsensusTest.php

@@ -54,7 +54,7 @@ public function prepareConsensusTests()
                     // versions reject usage of some flags. We skip verification of some
                     // of these, should be a @todo determine how many of these tests are
                     // skipped
-                    if ($flags !== ($flags & BITCOINCONSENSUS_VERIFY_ALL)) {
+                    if ($flags !== ($flags & BITCOINCONSENSUS_SCRIPT_FLAGS_VERIFY_ALL)) {
                         continue;
                     }
                 }