diff --git a/doc/psbt.md b/doc/psbt.md index 0f31cb8eba..e555718349 100644 --- a/doc/psbt.md +++ b/doc/psbt.md @@ -67,6 +67,10 @@ hardware implementations will typically implement multiple roles simultaneously. input a PSBT, adds UTXO, key, and script data to inputs and outputs that miss it, and optionally signs inputs. Where possible it also finalizes the partial signatures. +- **`descriptorprocesspsbt` (Updater, Signer, Finalizer)** is a node RPC that takes + as input a PSBT and a list of descriptors. It updates SegWit inputs with + information available from the UTXO set and the mempool and signs the inputs using + the provided descriptors. Where possible it also finalizes the partial signatures. - **`utxoupdatepsbt` (Updater)** is a node RPC that takes a PSBT and updates it to include information available from the UTXO set (works only for SegWit inputs). diff --git a/test/functional/mempool_ephemeral_dust.py b/test/functional/mempool_ephemeral_dust.py index ac20f3a276..675c5d25b6 100755 --- a/test/functional/mempool_ephemeral_dust.py +++ b/test/functional/mempool_ephemeral_dust.py @@ -134,7 +134,7 @@ class EphemeralDustTest(BitcoinTestFramework): sats_fee = 1 dusty_tx = self.wallet.create_self_transfer_multi(fee_per_output=sats_fee, version=3) self.add_output_to_create_multi_result(dusty_tx) - assert_equal(int(COIN * dusty_tx["fee"]), sats_fee) # has fees + assert_equal(dusty_tx["fee"], sats_fee) # has fees (ELEMENTS: fee is in sats, not BTC) assert_greater_than(dusty_tx["tx"].vout[0].nValue.getAmount(), 330) # main output is not dust assert_equal(dusty_tx["tx"].vout[-1].nValue.getAmount(), 1) # added one is dust (1 sat, below threshold) diff --git a/test/functional/test_framework/wallet.py b/test/functional/test_framework/wallet.py index e640a2bb6e..2a60f0c244 100755 --- a/test/functional/test_framework/wallet.py +++ b/test/functional/test_framework/wallet.py @@ -362,7 +362,7 @@ class MiniWallet: coinbase=False, confirmations=0, ) for i in range(len(tx.vout) - ( 1 if fee else 0 ))], # ELEMENTS remove fee output only if fee is non-zero - "fee": Decimal(fee) / COIN, # ELEMENTS: fee is in sats here, convert to BTC + "fee": fee, "txid": txid, "wtxid": tx.getwtxid(), "hex": tx.serialize().hex(),