blocktrail / blocktrail-sdk-php

src/BlocktrailSDKInterface.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace Blocktrail\SDK;
 
-use BitWasp\Bitcoin\Network\NetworkInterface;
 use Blocktrail\SDK\Connection\RestClient;
 
 /**

src/TransactionBuilder.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use BitWasp\Bitcoin\Address\AddressInterface;
 use BitWasp\Bitcoin\Address\SegwitAddress;
 use BitWasp\Bitcoin\Network\NetworkInterface;
-use BitWasp\Bitcoin\Script\Script;
 use BitWasp\Bitcoin\Script\ScriptFactory;
 use BitWasp\Bitcoin\Script\ScriptInterface;
 use BitWasp\Buffertools\Buffer;

src/Wallet.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use BitWasp\Bitcoin\Address\AddressFactory;
 use BitWasp\Bitcoin\Bitcoin;
-use BitWasp\Bitcoin\Key\Deterministic\HierarchicalKeyFactory;
 use BitWasp\Bitcoin\MessageSigner\MessageSigner;
 use BitWasp\Bitcoin\Network\NetworkInterface;
 use BitWasp\Bitcoin\Script\P2shScript;

src/WalletSweeper.php

Doc Comments +6 added lines, -6 removed lines

@@ -72,7 +72,7 @@ 
      * @param array               $blocktrailPublicKeys =
      * @param UnspentOutputFinder $utxoFinder
      * @param string $network
-     * @param bool $testnet
+     * @param bool $tesnet
      * @throws \Exception
      */
     public function __construct(BufferInterface $primarySeed, BufferInterface $backupSeed, array $blocktrailPublicKeys, UnspentOutputFinder $utxoFinder, $network, $tesnet = false) {
@@ -110,7 +110,7 @@ 
     /**
      * generate multisig address for given path
      *
-     * @param string|BIP32Path $path
+     * @param string $path
      * @return array[string, ScriptInterface]                 [address, redeemScript]
      * @throws \Exception
      */
@@ -139,8 +139,8 @@ 
     /**
      * create a batch of multisig addresses
      *
-     * @param $start
-     * @param $count
+     * @param integer $start
+     * @param integer $count
      * @param $keyIndex
      * @return array
      */
@@ -170,7 +170,7 @@ 
     /**
      * gets the blocktrail pub key for the given path from the stored array of pub keys
      *
-     * @param string|BIP32Path  $path
+     * @param BIP32Path  $path
      * @return BIP32Key
      * @throws \Exception
      */
@@ -288,7 +288,7 @@ 
     }
 
     /**
-     * @param $destinationAddress
+     * @param string $destinationAddress
      * @return TransactionInterface
      */
     protected function createTransaction($destinationAddress) {

Unused Use Statements -2 removed lines

@@ -5,8 +5,6 @@
 use BitWasp\Bitcoin\Address\AddressFactory;
 use BitWasp\Bitcoin\Bitcoin;
 use BitWasp\Bitcoin\Key\Deterministic\HierarchicalKeyFactory;
-use BitWasp\Bitcoin\Network\NetworkFactory;
-use BitWasp\Bitcoin\Network\NetworkInterface;
 use BitWasp\Bitcoin\Script\P2shScript;
 use BitWasp\Bitcoin\Script\ScriptFactory;
 use BitWasp\Bitcoin\Script\WitnessScript;

Spacing +5 added lines, -5 removed lines

@@ -123,7 +123,7 @@ 
             $this->getBlocktrailPublicKey($path)->buildKey($path)->publicKey()
         ]), false);
 
-        if ($this->networkParams->getName() !== "bitcoincash" && (int) $path[2] === 2) {
+        if ($this->networkParams->getName() !== "bitcoincash" && (int)$path[2] === 2) {
             $witnessScript = new WitnessScript($multisig);
             $redeemScript = new P2shScript($witnessScript);
             $address = $redeemScript->getAddress()->getAddress($this->networkParams->getNetwork());
@@ -149,7 +149,7 @@ 
 
         for ($i = 0; $i < $count; $i++) {
             //create a path subsequent address
-            $path = (string)WalletPath::create($keyIndex, $_chain = 0, $start+$i)->path()->publicPath();
+            $path = (string)WalletPath::create($keyIndex, $_chain = 0, $start + $i)->path()->publicPath();
             list($address, $redeem, $witness) = $this->createAddress($path);
             $addresses[$address] = array(
                 //'address' => $address,
@@ -198,7 +198,7 @@ 
         $totalUTXOs = 0;
         $totalAddressesGenerated = 0;
 
-        $addressUTXOs = array();    //addresses and their utxos, paths and redeem scripts
+        $addressUTXOs = array(); //addresses and their utxos, paths and redeem scripts
 
         //for each blocktrail pub key, do fund discovery on batches of addresses
         foreach ($this->blocktrailPublicKeys as $keyIndex => $blocktrailPubKey) {
@@ -234,7 +234,7 @@ 
                     }
 
                     $addressUTXOs[$address]['utxos'][] = $utxo;
-                    $totalUTXOs ++;
+                    $totalUTXOs++;
 
                     //add up the total utxo value for all addresses
                     $totalBalance += $utxo['value'];
@@ -349,7 +349,7 @@ 
             $signer->redeemBitcoinCash(true);
         }
 
-        assert(Util::all(function ($signInfo) {
+        assert(Util::all(function($signInfo) {
             return $signInfo instanceof SignInfo;
         }, $signInfo), '$signInfo should be SignInfo[]');
 

src/BlocktrailSDK.php

Spacing +9 added lines, -12 removed lines

@@ -291,7 +291,7 @@ 
      * @return array[]            array containing the response
      */
     public function transactions($txhashes) {
-        $response = $this->client->get("transactions/" . implode(",", $txhashes));
+        $response = $this->client->get("transactions/".implode(",", $txhashes));
         return self::jsonDecode($response->body(), true);
     }
     
@@ -542,7 +542,7 @@ 
     }
 
     private function formatBlocktrailKeys(NetworkInterface $network, array $blocktrailPublicKeys) {
-        return Util::arrayMapWithIndex(function ($keyIndex, $pubKeyTuple) use ($network) {
+        return Util::arrayMapWithIndex(function($keyIndex, $pubKeyTuple) use ($network) {
             return [$keyIndex, BIP32Key::create($network, HierarchicalKeyFactory::fromExtended($pubKeyTuple[0], $network), $pubKeyTuple[1])];
         }, $blocktrailPublicKeys);
     }
@@ -564,7 +564,7 @@ 
             } else {
                 // create new primary seed
                 /** @var HierarchicalKey $primaryPrivateKey */
-                list($primaryMnemonic, , $primaryPrivateKey) = $this->newPrimarySeed($options['passphrase']);
+                list($primaryMnemonic,, $primaryPrivateKey) = $this->newPrimarySeed($options['passphrase']);
                 if ($storePrimaryMnemonic !== false) {
                     $storePrimaryMnemonic = true;
                 }
@@ -604,7 +604,7 @@ 
         $backupPublicKey = null;
         if (!isset($options['backup_mnemonic']) && !isset($options['backup_public_key'])) {
             /** @var HierarchicalKey $backupPrivateKey */
-            list($backupMnemonic, , ) = $this->newBackupSeed();
+            list($backupMnemonic,,) = $this->newBackupSeed();
         } else if (isset($options['backup_mnemonic'])) {
             $backupMnemonic = $options['backup_mnemonic'];
         } elseif (isset($options['backup_public_key'])) {
@@ -774,7 +774,7 @@ 
                 'backup_seed' => $backupSeed ? MnemonicFactory::bip39()->entropyToMnemonic(new Buffer($backupSeed)) : null,
                 'recovery_encrypted_secret' => $recoveryEncryptedSecret ? MnemonicFactory::bip39()->entropyToMnemonic(new Buffer(base64_decode($recoveryEncryptedSecret))) : null,
                 'encrypted_secret' => $encryptedSecret ? MnemonicFactory::bip39()->entropyToMnemonic(new Buffer(base64_decode($encryptedSecret))) : null,
-                'blocktrail_public_keys' => Util::arrayMapWithIndex(function ($keyIndex, BIP32Key $pubKey) {
+                'blocktrail_public_keys' => Util::arrayMapWithIndex(function($keyIndex, BIP32Key $pubKey) {
                     return [$keyIndex, $pubKey->tuple()];
                 }, $blocktrailPublicKeys),
             ],
@@ -910,7 +910,7 @@ 
                 'backup_seed'               => $backupSeed ? MnemonicFactory::bip39()->entropyToMnemonic($backupSeed) : null,
                 'recovery_encrypted_secret' => $recoveryEncryptedSecret ? EncryptionMnemonic::encode($recoveryEncryptedSecret) : null,
                 'encrypted_secret'          => $encryptedSecret ? EncryptionMnemonic::encode($encryptedSecret) : null,
-                'blocktrail_public_keys'    => Util::arrayMapWithIndex(function ($keyIndex, BIP32Key $pubKey) {
+                'blocktrail_public_keys'    => Util::arrayMapWithIndex(function($keyIndex, BIP32Key $pubKey) {
                     return [$keyIndex, $pubKey->tuple()];
                 }, $blocktrailPublicKeys),
             ]
@@ -1082,10 +1082,7 @@ 
         }
 
         $identifier = $options['identifier'];
-        $readonly = isset($options['readonly']) ? $options['readonly'] :
-                    (isset($options['readOnly']) ? $options['readOnly'] :
-                        (isset($options['read-only']) ? $options['read-only'] :
-                            false));
+        $readonly = isset($options['readonly']) ? $options['readonly'] : (isset($options['readOnly']) ? $options['readOnly'] : (isset($options['read-only']) ? $options['read-only'] : false));
 
         // get the wallet data from the server
         $data = $this->getWallet($identifier);
@@ -1762,7 +1759,7 @@ 
      */
     public static function sortMultisigKeys(array $pubKeys) {
         $result = array_values($pubKeys);
-        usort($result, function (PublicKeyInterface $a, PublicKeyInterface $b) {
+        usort($result, function(PublicKeyInterface $a, PublicKeyInterface $b) {
             $av = $a->getHex();
             $bv = $b->getHex();
             return $av == $bv ? 0 : $av > $bv ? 1 : -1;
@@ -1788,7 +1785,7 @@ 
     }
 
     public static function normalizeBIP32KeyArray($keys, NetworkInterface $network) {
-        return Util::arrayMapWithIndex(function ($idx, $key) use ($network) {
+        return Util::arrayMapWithIndex(function($idx, $key) use ($network) {
             return [$idx, self::normalizeBIP32Key($key, $network)];
         }, $keys);
     }

Doc Comments +19 added lines, -11 removed lines

@@ -663,6 +663,11 @@ 
         ];
     }
 
+    /**
+     * @param integer $bits
+     *
+     * @return string
+     */
     public static function randomBits($bits) {
         return self::randomBytes($bits / 8);
     }
@@ -955,7 +960,7 @@ 
      * create wallet using the API
      *
      * @param string    $identifier             the wallet identifier to create
-     * @param array     $primaryPublicKey       BIP32 extended public key - [key, path]
+     * @param string[]     $primaryPublicKey       BIP32 extended public key - [key, path]
      * @param array     $backupPublicKey        BIP32 extended public key - [backup key, path "M"]
      * @param string    $primaryMnemonic        mnemonic to store
      * @param string    $checksum               checksum to store
@@ -983,10 +988,10 @@ 
      *
      * @param string $identifier       the wallet identifier to create
      * @param array  $primaryPublicKey BIP32 extended public key - [key, path]
-     * @param array  $backupPublicKey  BIP32 extended public key - [backup key, path "M"]
-     * @param        $encryptedPrimarySeed
-     * @param        $encryptedSecret
-     * @param        $recoverySecret
+     * @param string[]  $backupPublicKey  BIP32 extended public key - [backup key, path "M"]
+     * @param        string|false $encryptedPrimarySeed
+     * @param        string|false $encryptedSecret
+     * @param        string|false $recoverySecret
      * @param string $checksum         checksum to store
      * @param int    $keyIndex         account that we expect to use
      * @param bool   $segwit           opt in to segwit
@@ -1016,9 +1021,9 @@ 
      *
      * @param string $identifier       the wallet identifier to create
      * @param array  $primaryPublicKey BIP32 extended public key - [key, path]
-     * @param array  $backupPublicKey  BIP32 extended public key - [backup key, path "M"]
-     * @param        $encryptedPrimarySeed
-     * @param        $encryptedSecret
+     * @param string[]  $backupPublicKey  BIP32 extended public key - [backup key, path "M"]
+     * @param        string|false $encryptedPrimarySeed
+     * @param        string|false $encryptedSecret
      * @param        $recoverySecret
      * @param string $checksum         checksum to store
      * @param int    $keyIndex         account that we expect to use
@@ -1712,7 +1717,7 @@ 
      * convert a Satoshi value to a BTC value
      *
      * @param int       $satoshi
-     * @return float
+     * @return string
      */
     public static function toBTC($satoshi) {
         return bcdiv((int)(string)$satoshi, 100000000, 8);
@@ -1742,7 +1747,7 @@ 
      * convert a BTC value to a Satoshi value
      *
      * @param float     $btc
-     * @return string
+     * @return integer
      */
     public static function toSatoshi($btc) {
         return (int)self::toSatoshiString($btc);
@@ -1751,7 +1756,7 @@ 
     /**
      * json_decode helper that throws exceptions when it fails to decode
      *
-     * @param      $json
+     * @param      string $json
      * @param bool $assoc
      * @return mixed
      * @throws \Exception
@@ -1803,6 +1808,9 @@ 
         }
     }
 
+    /**
+     * @param BIP32Key[] $keys
+     */
     public static function normalizeBIP32KeyArray($keys, NetworkInterface $network) {
         return Util::arrayMapWithIndex(function ($idx, $key) use ($network) {
             return [$idx, self::normalizeBIP32Key($key, $network)];

src/BackupGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -61,11 +61,11 @@ 
             define('DOMPDF_ENABLE_AUTOLOAD', false);
 
             //try the different possible locations for the config file, depending on if the sdk is included as a dependency or is the main project itself
-            (@include_once __DIR__ . '/../../../dompdf/dompdf/dompdf_config.inc.php') || @include_once __DIR__ . '/../vendor/dompdf/dompdf/dompdf_config.inc.php';
+            (@include_once __DIR__.'/../../../dompdf/dompdf/dompdf_config.inc.php') || @include_once __DIR__.'/../vendor/dompdf/dompdf/dompdf_config.inc.php';
         }
 
         //set the fonts path
-        $this->fontsPath = dirname(__FILE__) . '/../resources/fonts';
+        $this->fontsPath = dirname(__FILE__).'/../resources/fonts';
 
         $this->network = $network;
         $this->identifier = $identifier;
@@ -89,7 +89,7 @@ 
             $qrCode = new QrCode();
             $qrCode
                 ->setText($key->key()->toExtendedKey())
-                ->setSize(self::QR_CODE_SIZE-20)
+                ->setSize(self::QR_CODE_SIZE - 20)
                 ->setPadding(10)
                 ->setErrorCorrection('high')
                 ->setForegroundColor(array('r' => 0, 'g' => 0, 'b' => 0, 'a' => 0))
@@ -130,7 +130,7 @@ 
             $passwordEncryptedSecret = $this->backupInfo['encrypted_secret'];
         }
 
-        $html = self::renderTemplate(__DIR__ . "/../resources/templates/recovery_sheet.html.php", [
+        $html = self::renderTemplate(__DIR__."/../resources/templates/recovery_sheet.html.php", [
             'identifier' => $this->identifier,
             'totalPubKeys' => $totalPubKeys,
             'pubKeysHtml' => $pubKeysHtml,