upgrade to bitcoin-php ^0.0.35

.scrutinizer.yml

@@ -1,3 +1,11 @@
+build:
+    nodes:
+        php-scrutinizer-run:
+            project_setup:
+                override: true
+            tests:
+                override: [php-scrutinizer-run]
+
 filter:
     excluded_paths: [examples*, vendor/*, build/*, tests/*]
 

composer.json

@@ -33,7 +33,8 @@
         "ext-dom": "*",
         "ext-curl": "*",
 
-        "bitwasp/bitcoin": "v0.0.34.1",
+        "bitwasp/bitcoin": "^v0.0.35.0",
+        "btccom/bitwasp-bitcoin-bch-addon": "v0.0.2",
         "btccom/justencrypt": "v0.2.0",
         "btccom/cashaddress": "v0.0.3",
         "mdanter/ecc": "v0.4.*",
@@ -46,7 +47,8 @@
         "dompdf/dompdf" : "0.6.*",
         "endroid/qrcode": "1.5.*",
         "blocktrail/cryptojs-aes-php": "0.1.*",
-        "spomky-labs/php-aes-gcm": "v1.2.0"
+        "spomky-labs/php-aes-gcm": "v1.2.0",
+        "symfony/http-foundation": "^2.7|^3.0|^4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "5.*",

examples/wallet_cpfp.php

@@ -1,12 +1,9 @@
 <?php
 
-use BitWasp\Bitcoin\Address\AddressFactory;
 use BitWasp\Bitcoin\Script\ScriptFactory;
 use Blocktrail\SDK\BlocktrailSDK;
-use Blocktrail\SDK\Connection\Exceptions\ObjectNotFound;
 use Blocktrail\SDK\TransactionBuilder;
 use Blocktrail\SDK\Wallet;
-use Blocktrail\SDK\WalletInterface;
 
 require_once __DIR__ . "/../vendor/autoload.php";
 
@@ -53,9 +50,10 @@
 
 // send info
 $myAddress = $wallet->getNewAddress();
+$addrReader = $wallet->getAddressReader();
 
 // setup txbuilder
-$txBuilder = new TransactionBuilder();
+$txBuilder = new TransactionBuilder($addrReader);
 
 // set change address to our address
 $txBuilder->setChangeAddress($myAddress);
@@ -90,8 +88,8 @@
 // add UTXOs to txbuilder
 foreach ($utxos as $utxo) {
     $scriptPubKey = ScriptFactory::fromHex($utxo['scriptpubkey_hex']);
-    $address = AddressFactory::fromString($utxo['address']);
-    $path = $wallet->getPathForAddress($address->getAddress());
+    $address = $addrReader->fromString($utxo['address']);
+    $path = $wallet->getPathForAddress($address->getAddress())['path'];
     $scripts = $wallet->getWalletScriptByPath($path);
     $redeemScript = $scripts->getRedeemScript();
     $witnessScript = null;