@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | } |
| 333 | 333 | |
| 334 | 334 | /** |
| 335 | - * @param string|BIP32Path $path |
|
| 335 | + * @param BIP32Path $path |
|
| 336 | 336 | * @return BIP32Key|false |
| 337 | 337 | * @throws \Exception |
| 338 | 338 | * |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | /** |
| 360 | 360 | * get address for the specified path |
| 361 | 361 | * |
| 362 | - * @param string|BIP32Path $path |
|
| 362 | + * @param string $path |
|
| 363 | 363 | * @return string |
| 364 | 364 | */ |
| 365 | 365 | public function getAddressByPath($path) { |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | } |
| 459 | 459 | |
| 460 | 460 | /** |
| 461 | - * @param string|BIP32Path $path |
|
| 461 | + * @param BIP32Path $path |
|
| 462 | 462 | * @return BIP32Key |
| 463 | 463 | * @throws \Exception |
| 464 | 464 | */ |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | * 'fund' the txBuilder with UTXOs (modified in place) |
| 610 | 610 | * |
| 611 | 611 | * @param TransactionBuilder $txBuilder |
| 612 | - * @param bool|true $lockUTXOs |
|
| 612 | + * @param boolean $lockUTXOs |
|
| 613 | 613 | * @param bool|false $allowZeroConf |
| 614 | 614 | * @param null|int $forceFee |
| 615 | 615 | * @return TransactionBuilder |
@@ -739,6 +739,10 @@ discard block |
||
| 739 | 739 | return [$txb->get(), $signInfo]; |
| 740 | 740 | } |
| 741 | 741 | |
| 742 | + /** |
|
| 743 | + * @param integer $optimalFeePerKB |
|
| 744 | + * @param integer $lowPriorityFeePerKB |
|
| 745 | + */ |
|
| 742 | 746 | public function determineFeeAndChange(TransactionBuilder $txBuilder, $optimalFeePerKB, $lowPriorityFeePerKB) { |
| 743 | 747 | $send = $txBuilder->getOutputs(); |
| 744 | 748 | $utxos = $txBuilder->getUtxos(); |
@@ -850,7 +854,7 @@ discard block |
||
| 850 | 854 | * @todo: mark this as deprecated, insist on the utxo's or qualified scripts. |
| 851 | 855 | * @param int $utxoCnt number of unspent inputs in transaction |
| 852 | 856 | * @param int $outputCnt number of outputs in transaction |
| 853 | - * @return float |
|
| 857 | + * @return integer |
|
| 854 | 858 | * @access public reminder that people might use this! |
| 855 | 859 | */ |
| 856 | 860 | public static function estimateFee($utxoCnt, $outputCnt) { |
@@ -874,7 +878,7 @@ discard block |
||
| 874 | 878 | * @todo: deprecate |
| 875 | 879 | * @param int $txinSize |
| 876 | 880 | * @param int $txoutSize |
| 877 | - * @return float |
|
| 881 | + * @return integer |
|
| 878 | 882 | */ |
| 879 | 883 | public static function estimateSize($txinSize, $txoutSize) { |
| 880 | 884 | return 4 + 4 + $txinSize + 4 + $txoutSize + 4; // version + txinVarInt + txin + txoutVarInt + txout + locktime |
@@ -884,7 +888,7 @@ discard block |
||
| 884 | 888 | * only supports estimating size for P2PKH/P2SH outputs |
| 885 | 889 | * |
| 886 | 890 | * @param int $outputCnt number of outputs in transaction |
| 887 | - * @return float |
|
| 891 | + * @return integer |
|
| 888 | 892 | */ |
| 889 | 893 | public static function estimateSizeOutputs($outputCnt) { |
| 890 | 894 | return ($outputCnt * 34); |
@@ -939,7 +943,7 @@ discard block |
||
| 939 | 943 | * |
| 940 | 944 | * @param UTXO[] $utxos |
| 941 | 945 | * @param array[] $outputs |
| 942 | - * @param $feeStrategy |
|
| 946 | + * @param string $feeStrategy |
|
| 943 | 947 | * @param $optimalFeePerKB |
| 944 | 948 | * @param $lowPriorityFeePerKB |
| 945 | 949 | * @return int |
@@ -1039,8 +1043,8 @@ discard block |
||
| 1039 | 1043 | * @param \array[] $outputs |
| 1040 | 1044 | * @param bool $lockUTXO |
| 1041 | 1045 | * @param bool $allowZeroConf |
| 1042 | - * @param int|null|string $feeStrategy |
|
| 1043 | - * @param null $forceFee |
|
| 1046 | + * @param string $feeStrategy |
|
| 1047 | + * @param null|integer $forceFee |
|
| 1044 | 1048 | * @return array |
| 1045 | 1049 | */ |
| 1046 | 1050 | public function coinSelection($outputs, $lockUTXO = true, $allowZeroConf = false, $feeStrategy = self::FEE_STRATEGY_OPTIMAL, $forceFee = null) { |