travis: use schnorr version of secp256k1 / schnorrsig

afk11 · afk11 · commit 5c0a5e7ed1f4 · 2019-12-11T00:09:02.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ php:
   - 7.3
 
 env:
-  - PHPUNIT=true PHPUNIT_EXT=true BITCOIN_VERSION="0.16.3" SECP256K1_COMMIT="cd329dbc3eaf096ae007e807b86b6f5947621ee3"
+  - PHPUNIT=true PHPUNIT_EXT=true BITCOIN_VERSION="0.16.3" SECP256K1_REMOTE="jonasnick/secp256k1" SECP256K1_COMMIT="1901f3bf9c6197f0bd3cc62e9f6c69296566a23a"
 
 dist: trusty
 sudo: required
@@ -20,14 +20,14 @@ cache:
 matrix:
   exclude:
     - php: 7.2
-      env: PHPUNIT=true PHPUNIT_EXT=true BITCOIN_VERSION="0.16.3" SECP256K1_COMMIT="cd329dbc3eaf096ae007e807b86b6f5947621ee3"
+      env: PHPUNIT=true PHPUNIT_EXT=true BITCOIN_VERSION="0.16.3" SECP256K1_REMOTE="jonasnick/secp256k1" SECP256K1_COMMIT="1901f3bf9c6197f0bd3cc62e9f6c69296566a23a"
 
   include:
     # add extra test runs for php7: coverage, codestyle, examples, rpc tests
     - php: 7.2
-      env: COVERAGE=true CODE_STYLE=true EXAMPLES=true PHPUNIT=true PHPUNIT_EXT=true BITCOIN_VERSION="0.16.3" SECP256K1_COMMIT="cd329dbc3eaf096ae007e807b86b6f5947621ee3"
+      env: COVERAGE=true CODE_STYLE=true EXAMPLES=true PHPUNIT=true PHPUNIT_EXT=true BITCOIN_VERSION="0.16.3" SECP256K1_REMOTE="jonasnick/secp256k1" SECP256K1_COMMIT="1901f3bf9c6197f0bd3cc62e9f6c69296566a23a"
     - php: 7.0
-      env: RPC_TEST=true BITCOIN_VERSION="0.16.3" SECP256K1_COMMIT="cd329dbc3eaf096ae007e807b86b6f5947621ee3"
+      env: RPC_TEST=true BITCOIN_VERSION="0.16.3" SECP256K1_REMOTE="jonasnick/secp256k1" SECP256K1_COMMIT="1901f3bf9c6197f0bd3cc62e9f6c69296566a23a"
 
 install:
     - |
@@ -47,16 +47,17 @@ install:
         fi
     - |
         if [ "$PHPUNIT_EXT" = "true" ]; then
-            git clone https://github.com/bitcoin/secp256k1.git &&
+            git clone https://github.com/${SECP256K1_REMOTE}.git &&
             cd secp256k1 && git checkout ${SECP256K1_COMMIT} &&
-            ./autogen.sh && ./configure --disable-jni --enable-module-recovery --enable-module-ecdh --enable-experimental &&
+            ./autogen.sh && ./configure --disable-jni --enable-module-recovery --enable-module-ecdh --enable-module-schnorrsig --enable-experimental &&
             make && sudo make install && cd ..;
         fi
     - |
         if [ "$PHPUNIT_EXT" = "true" ]; then
-            git clone -b v0.2.0 https://github.com/Bit-Wasp/secp256k1-php &&
+            git clone https://github.com/afk11/secp256k1-php &&
             cd secp256k1-php/secp256k1 &&
-            phpize && ./configure &&
+            git fetch origin schnorr2 && git checkout schnorr2 &&
+            phpize && ./configure --with-secp256k1 --with-secp256k1-config --with-module-ecdh --with-module-recovery --with-module-schnorrsig &&
             make && sudo make install && echo "extension=secp256k1.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini && cd ../..;
         fi
     - |
@@ -77,6 +78,8 @@ before_script:
   - if [ "${COVERAGE}" != "true" ] && [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then phpenv config-rm xdebug.ini && echo "xdebug disabled"; fi
 
 script:
+  - vendor/bin/phpunit --filter 'TaprootTest::testScript#20'
+  - vendor/bin/phpunit --filter 'TaprootTest::testScript#21'
   - travis/run_secp256k1_tests.sh || exit 1
   - if [ "$COVERAGE" = "true" ]; then pwd && vendor/bin/phpstan analyse src tests -l 1; fi
   - make phpunit-ci || exit 1
diff --git a/src/Script/Interpreter/CheckerBase.php b/src/Script/Interpreter/CheckerBase.php
@@ -284,22 +284,26 @@ public function getTaprootSigHash(int $sigHashType, int $sigVersion, ExecutionCo
     public function checkSigSchnorr(BufferInterface $sig64, BufferInterface $key32, int $sigVersion, ExecutionContext $execContext): bool
     {
         if ($sig64->getSize() === 0) {
+            echo "sig64 = 0\n";
             return false;
         }
         if ($key32->getSize() !== 32) {
+            echo "key != 32\n";
             return false;
         }
 
         $hashType = SigHash::TAPDEFAULT;
         if ($sig64->getSize() === 65) {
             $hashType = (int) $sig64->slice(64, 1)->getInt();
             if ($hashType === SigHash::TAPDEFAULT) {
+                echo "badsighash1\n";
                 return false;
             }
             $sig64 = $sig64->slice(0, 64);
         }
 
         if ($sig64->getSize() !== 64) {
+            echo "sig.size!=64\n";
             return false;
         }
 
@@ -309,6 +313,7 @@ public function checkSigSchnorr(BufferInterface $sig64, BufferInterface $key32,
             $sigHash = $this->getTaprootSigHash($hashType, $sigVersion, $execContext);
             return $pubKey->verifySchnorr($sigHash, $sig);
         } catch (\Exception $e) {
+            echo "checksigSchnorr exception: ". $e->getMessage().PHP_EOL;
             return false;
         }
     }
diff --git a/src/Script/Interpreter/Interpreter.php b/src/Script/Interpreter/Interpreter.php
@@ -295,10 +295,12 @@ private function verifyWitnessProgram(WitnessProgram $witnessProgram, ScriptWitn
             }
 
             if ($witnessCount === 0) {
+                echo "empty witness\n";
                 return false;
             } else if ($witnessCount >= 2 && $scriptWitness->bottom()->getSize() > 0 && ord($scriptWitness->bottom()->getBinary()[0]) === TaprootHasher::TAPROOT_ANNEX_BYTE) {
                 $annex = $scriptWitness->bottom();
                 if (($flags & self::VERIFY_DISCOURAGE_UPGRADABLE_ANNEX)) {
+                    echo "uigradable annex\n";
                     return false;
                 }
                 $execContext->setAnnexHash(Hash::sha256($annex));
@@ -311,6 +313,7 @@ private function verifyWitnessProgram(WitnessProgram $witnessProgram, ScriptWitn
                 // key spend path - doesn't use the interpreter, directly checks signature
                 $signature = $scriptWitness[count($scriptWitness) - 1];
                 if (!$checker->checkSigSchnorr($signature, $witnessProgram->getProgram(), SigHash::TAPROOT, $execContext)) {
+                    echo "invalid signature\n";
                     return false;
                 }
                 return true;
@@ -329,11 +332,13 @@ private function verifyWitnessProgram(WitnessProgram $witnessProgram, ScriptWitn
                 if ($control->getSize() < TAPROOT_CONTROL_BASE_SIZE ||
                     $control->getSize() > TAPROOT_CONTROL_MAX_SIZE ||
                     (($control->getSize() - TAPROOT_CONTROL_BASE_SIZE) % TAPROOT_CONTROL_BRANCH_SIZE !== 0)) {
+                    echo "invalid control size\n";
                     return false;
                 }
 
                 $leafHash = null;
                 if (!$this->verifyTaprootCommitment($control, $witnessProgram->getProgram(), $scriptPubKey, $leafHash)) {
+                    echo "invalid taproot commitment\n";
                     return false;
                 }
                 $execContext->setTapLeafHash($leafHash);
@@ -344,11 +349,15 @@ private function verifyWitnessProgram(WitnessProgram $witnessProgram, ScriptWitn
                 }
 
                 // return true at this stage, need further work to proceed
-                return $this->executeWitnessProgram($scriptWitness, new Script($scriptPubKey), SigHash::TAPSCRIPT, $flags, $checker, $execContext);
+                $ret = $this->executeWitnessProgram($scriptWitness, new Script($scriptPubKey), SigHash::TAPSCRIPT, $flags, $checker, $execContext);
+                var_dump("witnessExec");
+                var_dump($ret);
+                return $ret;
             }
         }
 
         if ($flags & self::VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM) {
+            echo "upgradable witness program\n";
             return false;
         }
 
@@ -520,17 +529,21 @@ private function evalChecksigTapscript(BufferInterface $sig, BufferInterface $ke
             assert($execContext->hasValidationWeightSet());
             $execContext->setValidationWeightLeft($execContext->getValidationWeightLeft() - VALIDATION_WEIGHT_OFFSET);
             if ($execContext->getValidationWeightLeft() < 0) {
+                echo "validation weight failure\n";
                 return false;
             }
         }
         if ($key->getSize() === 0) {
+            echo "keysize=0\n";
             return false;
         } else if ($key->getSize() === 32) {
             if ($success && !$checker->checkSigSchnorr($sig, $key, $sigVersion, $execContext)) {
+                echo "keysize = 32 and checksig failed\n";
                 return false;
             }
         } else {
             if ($flags & self::VERIFY_DISCOURAGE_UPGRADABLE_PUBKEYTYPE) {
+                echo "upgradable keytype\n";
                 return false;
             }
         }
@@ -614,9 +627,9 @@ public function evaluate(ScriptInterface $script, Stack $mainStack, int $sigVers
                     }
 
                     $mainStack->push($pushData);
-                    // echo " - [pushed '" . $pushData->getHex() . "']\n";
+                     echo " - [pushed '" . $pushData->getHex() . "']\n";
                 } elseif ($fExec || (Opcodes::OP_IF <= $opCode && $opCode <= Opcodes::OP_ENDIF)) {
-                    // echo "OPCODE - " . $script->getOpcodes()->getOp($opCode) . "\n";
+                     echo "OPCODE - " . $script->getOpcodes()->getOp($opCode) . "\n";
                     switch ($opCode) {
                         case Opcodes::OP_1NEGATE:
                         case Opcodes::OP_1:
@@ -1081,9 +1094,11 @@ public function evaluate(ScriptInterface $script, Stack $mainStack, int $sigVers
 
                         case Opcodes::OP_CHECKSIGADD:
                             if ($sigVersion !== SigHash::TAPSCRIPT) {
+                                echo "sigVersion != tapscript\n";
                                 throw new \RuntimeException('Opcode not found');
                             }
                             if ($mainStack->count() < 3) {
+                                echo "mainStack count != 3\n";
                                 return false;
                             }
                             $pubkey = $mainStack[-1];
@@ -1092,6 +1107,7 @@ public function evaluate(ScriptInterface $script, Stack $mainStack, int $sigVers
 
                             $success = false;
                             if (!$this->evalChecksig($sig, $pubkey, $script, $hashStartPos, $flags, $checker, $sigVersion, $execContext, $success)) {
+                                echo "checksig add - evalChecksig false\n";
                                 return false;
                             }
                             $push = Number::gmp($this->math->add($n->getGmp(), gmp_init($success ? 1 : 0, 10)), $this->math)->getBuffer();
@@ -1248,11 +1264,11 @@ public function evaluate(ScriptInterface $script, Stack $mainStack, int $sigVers
 
             return true;
         } catch (ScriptRuntimeException $e) {
-            // echo "\n Runtime: " . $e->getMessage() . "\n" . $e->getTraceAsString() . PHP_EOL;
+             echo "\n Runtime: " . $e->getMessage() . "\n" . $e->getTraceAsString() . PHP_EOL;
             // Failure due to script tags, can access flag: $e->getFailureFlag()
             return false;
         } catch (\Exception $e) {
-            // echo "\n General: " . $e->getMessage()  . PHP_EOL . $e->getTraceAsString() . PHP_EOL;
+             echo "\n General: " . $e->getMessage()  . PHP_EOL . $e->getTraceAsString() . PHP_EOL;
             return false;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -284,22 +284,26 @@ public function getTaprootSigHash(int $sigHashType, int $sigVersion, ExecutionCo`
`284`	`284`	`public function checkSigSchnorr(BufferInterface $sig64, BufferInterface $key32, int $sigVersion, ExecutionContext $execContext): bool`
`285`	`285`	`{`
`286`	`286`	`if ($sig64->getSize() === 0) {`
	`287`	`+ echo "sig64 = 0\n";`
`287`	`288`	`return false;`
`288`	`289`	`}`
`289`	`290`	`if ($key32->getSize() !== 32) {`
	`291`	`+ echo "key != 32\n";`
`290`	`292`	`return false;`
`291`	`293`	`}`
`292`	`294`
`293`	`295`	`$hashType = SigHash::TAPDEFAULT;`
`294`	`296`	`if ($sig64->getSize() === 65) {`
`295`	`297`	`$hashType = (int) $sig64->slice(64, 1)->getInt();`
`296`	`298`	`if ($hashType === SigHash::TAPDEFAULT) {`
	`299`	`+ echo "badsighash1\n";`
`297`	`300`	`return false;`
`298`	`301`	`}`
`299`	`302`	`$sig64 = $sig64->slice(0, 64);`
`300`	`303`	`}`
`301`	`304`
`302`	`305`	`if ($sig64->getSize() !== 64) {`
	`306`	`+ echo "sig.size!=64\n";`
`303`	`307`	`return false;`
`304`	`308`	`}`
`305`	`309`
`@@ -309,6 +313,7 @@ public function checkSigSchnorr(BufferInterface $sig64, BufferInterface $key32,`
`309`	`313`	`$sigHash = $this->getTaprootSigHash($hashType, $sigVersion, $execContext);`
`310`	`314`	`return $pubKey->verifySchnorr($sigHash, $sig);`
`311`	`315`	`} catch (\Exception $e) {`
	`316`	`+ echo "checksigSchnorr exception: ". $e->getMessage().PHP_EOL;`
`312`	`317`	`return false;`
`313`	`318`	`}`
`314`	`319`	`}`
Original file line number	Diff line number	Diff line change
`@@ -295,10 +295,12 @@ private function verifyWitnessProgram(WitnessProgram $witnessProgram, ScriptWitn`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`if ($witnessCount === 0) {`
	`298`	`+ echo "empty witness\n";`
`298`	`299`	`return false;`
`299`	`300`	`} else if ($witnessCount >= 2 && $scriptWitness->bottom()->getSize() > 0 && ord($scriptWitness->bottom()->getBinary()[0]) === TaprootHasher::TAPROOT_ANNEX_BYTE) {`
`300`	`301`	`$annex = $scriptWitness->bottom();`
`301`	`302`	`if (($flags & self::VERIFY_DISCOURAGE_UPGRADABLE_ANNEX)) {`
	`303`	`+ echo "uigradable annex\n";`
`302`	`304`	`return false;`
`303`	`305`	`}`
`304`	`306`	`$execContext->setAnnexHash(Hash::sha256($annex));`
`@@ -311,6 +313,7 @@ private function verifyWitnessProgram(WitnessProgram $witnessProgram, ScriptWitn`
`311`	`313`	`// key spend path - doesn't use the interpreter, directly checks signature`
`312`	`314`	`$signature = $scriptWitness[count($scriptWitness) - 1];`
`313`	`315`	`if (!$checker->checkSigSchnorr($signature, $witnessProgram->getProgram(), SigHash::TAPROOT, $execContext)) {`
	`316`	`+ echo "invalid signature\n";`
`314`	`317`	`return false;`
`315`	`318`	`}`
`316`	`319`	`return true;`
`@@ -329,11 +332,13 @@ private function verifyWitnessProgram(WitnessProgram $witnessProgram, ScriptWitn`
`329`	`332`	`if ($control->getSize() < TAPROOT_CONTROL_BASE_SIZE \|\|`
`330`	`333`	`$control->getSize() > TAPROOT_CONTROL_MAX_SIZE \|\|`
`331`	`334`	`(($control->getSize() - TAPROOT_CONTROL_BASE_SIZE) % TAPROOT_CONTROL_BRANCH_SIZE !== 0)) {`
	`335`	`+ echo "invalid control size\n";`
`332`	`336`	`return false;`
`333`	`337`	`}`
`334`	`338`
`335`	`339`	`$leafHash = null;`
`336`	`340`	`if (!$this->verifyTaprootCommitment($control, $witnessProgram->getProgram(), $scriptPubKey, $leafHash)) {`
	`341`	`+ echo "invalid taproot commitment\n";`
`337`	`342`	`return false;`
`338`	`343`	`}`
`339`	`344`	`$execContext->setTapLeafHash($leafHash);`
`@@ -344,11 +349,15 @@ private function verifyWitnessProgram(WitnessProgram $witnessProgram, ScriptWitn`
`344`	`349`	`}`
`345`	`350`
`346`	`351`	`// return true at this stage, need further work to proceed`
`347`		`- return $this->executeWitnessProgram($scriptWitness, new Script($scriptPubKey), SigHash::TAPSCRIPT, $flags, $checker, $execContext);`
	`352`	`+ $ret = $this->executeWitnessProgram($scriptWitness, new Script($scriptPubKey), SigHash::TAPSCRIPT, $flags, $checker, $execContext);`
	`353`	`+ var_dump("witnessExec");`
	`354`	`+ var_dump($ret);`
	`355`	`+ return $ret;`
`348`	`356`	`}`
`349`	`357`	`}`
`350`	`358`
`351`	`359`	`if ($flags & self::VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM) {`
	`360`	`+ echo "upgradable witness program\n";`
`352`	`361`	`return false;`
`353`	`362`	`}`
`354`	`363`
`@@ -520,17 +529,21 @@ private function evalChecksigTapscript(BufferInterface $sig, BufferInterface $ke`
`520`	`529`	`assert($execContext->hasValidationWeightSet());`
`521`	`530`	`$execContext->setValidationWeightLeft($execContext->getValidationWeightLeft() - VALIDATION_WEIGHT_OFFSET);`
`522`	`531`	`if ($execContext->getValidationWeightLeft() < 0) {`
	`532`	`+ echo "validation weight failure\n";`
`523`	`533`	`return false;`
`524`	`534`	`}`
`525`	`535`	`}`
`526`	`536`	`if ($key->getSize() === 0) {`
	`537`	`+ echo "keysize=0\n";`
`527`	`538`	`return false;`
`528`	`539`	`} else if ($key->getSize() === 32) {`
`529`	`540`	`if ($success && !$checker->checkSigSchnorr($sig, $key, $sigVersion, $execContext)) {`
	`541`	`+ echo "keysize = 32 and checksig failed\n";`
`530`	`542`	`return false;`
`531`	`543`	`}`
`532`	`544`	`} else {`
`533`	`545`	`if ($flags & self::VERIFY_DISCOURAGE_UPGRADABLE_PUBKEYTYPE) {`
	`546`	`+ echo "upgradable keytype\n";`
`534`	`547`	`return false;`
`535`	`548`	`}`
`536`	`549`	`}`
`@@ -614,9 +627,9 @@ public function evaluate(ScriptInterface $script, Stack $mainStack, int $sigVers`
`614`	`627`	`}`
`615`	`628`
`616`	`629`	`$mainStack->push($pushData);`
`617`		`- // echo " - [pushed '" . $pushData->getHex() . "']\n";`
	`630`	`+ echo " - [pushed '" . $pushData->getHex() . "']\n";`
`618`	`631`	`} elseif ($fExec \|\| (Opcodes::OP_IF <= $opCode && $opCode <= Opcodes::OP_ENDIF)) {`
`619`		`- // echo "OPCODE - " . $script->getOpcodes()->getOp($opCode) . "\n";`
	`632`	`+ echo "OPCODE - " . $script->getOpcodes()->getOp($opCode) . "\n";`
`620`	`633`	`switch ($opCode) {`
`621`	`634`	`case Opcodes::OP_1NEGATE:`
`622`	`635`	`case Opcodes::OP_1:`
`@@ -1081,9 +1094,11 @@ public function evaluate(ScriptInterface $script, Stack $mainStack, int $sigVers`
`1081`	`1094`
`1082`	`1095`	`case Opcodes::OP_CHECKSIGADD:`
`1083`	`1096`	`if ($sigVersion !== SigHash::TAPSCRIPT) {`
	`1097`	`+ echo "sigVersion != tapscript\n";`
`1084`	`1098`	`throw new \RuntimeException('Opcode not found');`
`1085`	`1099`	`}`
`1086`	`1100`	`if ($mainStack->count() < 3) {`
	`1101`	`+ echo "mainStack count != 3\n";`
`1087`	`1102`	`return false;`
`1088`	`1103`	`}`
`1089`	`1104`	`$pubkey = $mainStack[-1];`
`@@ -1092,6 +1107,7 @@ public function evaluate(ScriptInterface $script, Stack $mainStack, int $sigVers`
`1092`	`1107`
`1093`	`1108`	`$success = false;`
`1094`	`1109`	`if (!$this->evalChecksig($sig, $pubkey, $script, $hashStartPos, $flags, $checker, $sigVersion, $execContext, $success)) {`
	`1110`	`+ echo "checksig add - evalChecksig false\n";`
`1095`	`1111`	`return false;`
`1096`	`1112`	`}`
`1097`	`1113`	`$push = Number::gmp($this->math->add($n->getGmp(), gmp_init($success ? 1 : 0, 10)), $this->math)->getBuffer();`
`@@ -1248,11 +1264,11 @@ public function evaluate(ScriptInterface $script, Stack $mainStack, int $sigVers`
`1248`	`1264`
`1249`	`1265`	`return true;`
`1250`	`1266`	`} catch (ScriptRuntimeException $e) {`
`1251`		`- // echo "\n Runtime: " . $e->getMessage() . "\n" . $e->getTraceAsString() . PHP_EOL;`
	`1267`	`+ echo "\n Runtime: " . $e->getMessage() . "\n" . $e->getTraceAsString() . PHP_EOL;`
`1252`	`1268`	`// Failure due to script tags, can access flag: $e->getFailureFlag()`
`1253`	`1269`	`return false;`
`1254`	`1270`	`} catch (\Exception $e) {`
`1255`		`- // echo "\n General: " . $e->getMessage() . PHP_EOL . $e->getTraceAsString() . PHP_EOL;`
	`1271`	`+ echo "\n General: " . $e->getMessage() . PHP_EOL . $e->getTraceAsString() . PHP_EOL;`
`1256`	`1272`	`return false;`
`1257`	`1273`	`}`
`1258`	`1274`	`}`