@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | /** |
| 340 | - * @param string|BIP32Path $path |
|
| 340 | + * @param BIP32Path $path |
|
| 341 | 341 | * @return BIP32Key|false |
| 342 | 342 | * @throws \Exception |
| 343 | 343 | * |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | /** |
| 365 | 365 | * get address for the specified path |
| 366 | 366 | * |
| 367 | - * @param string|BIP32Path $path |
|
| 367 | + * @param string $path |
|
| 368 | 368 | * @return string |
| 369 | 369 | */ |
| 370 | 370 | public function getAddressByPath($path) { |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | } |
| 464 | 464 | |
| 465 | 465 | /** |
| 466 | - * @param string|BIP32Path $path |
|
| 466 | + * @param BIP32Path $path |
|
| 467 | 467 | * @return BIP32Key |
| 468 | 468 | * @throws \Exception |
| 469 | 469 | */ |
@@ -623,7 +623,7 @@ discard block |
||
| 623 | 623 | * 'fund' the txBuilder with UTXOs (modified in place) |
| 624 | 624 | * |
| 625 | 625 | * @param TransactionBuilder $txBuilder |
| 626 | - * @param bool|true $lockUTXOs |
|
| 626 | + * @param boolean $lockUTXOs |
|
| 627 | 627 | * @param bool|false $allowZeroConf |
| 628 | 628 | * @param null|int $forceFee |
| 629 | 629 | * @return TransactionBuilder |
@@ -754,6 +754,10 @@ discard block |
||
| 754 | 754 | return [$txb->get(), $signInfo]; |
| 755 | 755 | } |
| 756 | 756 | |
| 757 | + /** |
|
| 758 | + * @param integer $optimalFeePerKB |
|
| 759 | + * @param integer $lowPriorityFeePerKB |
|
| 760 | + */ |
|
| 757 | 761 | public function determineFeeAndChange(TransactionBuilder $txBuilder, $highPriorityFeePerKB, $optimalFeePerKB, $lowPriorityFeePerKB) { |
| 758 | 762 | $send = $txBuilder->getOutputs(); |
| 759 | 763 | $utxos = $txBuilder->getUtxos(); |
@@ -865,7 +869,7 @@ discard block |
||
| 865 | 869 | * @todo: mark this as deprecated, insist on the utxo's or qualified scripts. |
| 866 | 870 | * @param int $utxoCnt number of unspent inputs in transaction |
| 867 | 871 | * @param int $outputCnt number of outputs in transaction |
| 868 | - * @return float |
|
| 872 | + * @return integer |
|
| 869 | 873 | * @access public reminder that people might use this! |
| 870 | 874 | */ |
| 871 | 875 | public static function estimateFee($utxoCnt, $outputCnt) { |
@@ -889,7 +893,7 @@ discard block |
||
| 889 | 893 | * @todo: deprecate |
| 890 | 894 | * @param int $txinSize |
| 891 | 895 | * @param int $txoutSize |
| 892 | - * @return float |
|
| 896 | + * @return integer |
|
| 893 | 897 | */ |
| 894 | 898 | public static function estimateSize($txinSize, $txoutSize) { |
| 895 | 899 | return 4 + 4 + $txinSize + 4 + $txoutSize + 4; // version + txinVarInt + txin + txoutVarInt + txout + locktime |
@@ -899,7 +903,7 @@ discard block |
||
| 899 | 903 | * only supports estimating size for P2PKH/P2SH outputs |
| 900 | 904 | * |
| 901 | 905 | * @param int $outputCnt number of outputs in transaction |
| 902 | - * @return float |
|
| 906 | + * @return integer |
|
| 903 | 907 | */ |
| 904 | 908 | public static function estimateSizeOutputs($outputCnt) { |
| 905 | 909 | return ($outputCnt * 34); |
@@ -954,7 +958,7 @@ discard block |
||
| 954 | 958 | * |
| 955 | 959 | * @param UTXO[] $utxos |
| 956 | 960 | * @param array[] $outputs |
| 957 | - * @param $feeStrategy |
|
| 961 | + * @param string $feeStrategy |
|
| 958 | 962 | * @param $highPriorityFeePerKB |
| 959 | 963 | * @param $optimalFeePerKB |
| 960 | 964 | * @param $lowPriorityFeePerKB |
@@ -1058,8 +1062,8 @@ discard block |
||
| 1058 | 1062 | * @param \array[] $outputs |
| 1059 | 1063 | * @param bool $lockUTXO |
| 1060 | 1064 | * @param bool $allowZeroConf |
| 1061 | - * @param int|null|string $feeStrategy |
|
| 1062 | - * @param null $forceFee |
|
| 1065 | + * @param string $feeStrategy |
|
| 1066 | + * @param null|integer $forceFee |
|
| 1063 | 1067 | * @return array |
| 1064 | 1068 | */ |
| 1065 | 1069 | public function coinSelection($outputs, $lockUTXO = true, $allowZeroConf = false, $feeStrategy = self::FEE_STRATEGY_OPTIMAL, $forceFee = null) { |