mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-12 06:58:57 +01:00
Merge bitcoin/bitcoin#23079: test: use MiniWallet for p2p_filter.py
cfdb6baa22test: use MiniWallet for p2p_filter.py (Sebastian Falbesoner)6fc2cd3f09test: introduce helper to create random P2WPKH scriptPubKeys (Sebastian Falbesoner)aa26797f69test: MiniWallet: add `send_to` method to create arbitrary txouts (Sebastian Falbesoner) Pull request description: This PR enables one more of the non-wallet functional tests (p2p_filter.py) to be run even with the Bitcoin Core wallet disabled by using the MiniWallet instead, as proposed in #20078. For this purpose, a MiniWallet method `send_to` is introduced first, which allows to create arbitrary outputs (scriptPubKey/amount). Note that the implementation for this is already present in feature_rbf.py (recently added in PR #22998), i.e. it is simply moved to the MiniWallet interface. ACKs for top commit: laanwj: Code review ACKcfdb6baa22Tree-SHA512: 13b063631f0d7af065b7757cfe8b47c9be6cb9850ac5db2968a2bba4f5a18cdc9f89173a9b03971545356225082042f5fdbe49d3036027d18e8b7eb042d04f5e
This commit is contained in:
@@ -28,6 +28,7 @@ from test_framework.script import (
|
||||
OP_NOP,
|
||||
SIGHASH_ALL,
|
||||
)
|
||||
from test_framework.script_util import key_to_p2wpkh_script
|
||||
from test_framework.util import (
|
||||
assert_equal,
|
||||
assert_greater_than_or_equal,
|
||||
@@ -146,6 +147,25 @@ class MiniWallet:
|
||||
self.sendrawtransaction(from_node=kwargs['from_node'], tx_hex=tx['hex'])
|
||||
return tx
|
||||
|
||||
def send_to(self, *, from_node, scriptPubKey, amount, fee=1000):
|
||||
"""
|
||||
Create and send a tx with an output to a given scriptPubKey/amount,
|
||||
plus a change output to our internal address. To keep things simple, a
|
||||
fixed fee given in Satoshi is used.
|
||||
|
||||
Note that this method fails if there is no single internal utxo
|
||||
available that can cover the cost for the amount and the fixed fee
|
||||
(the utxo with the largest value is taken).
|
||||
|
||||
Returns a tuple (txid, n) referring to the created external utxo outpoint.
|
||||
"""
|
||||
tx = self.create_self_transfer(from_node=from_node, fee_rate=0, mempool_valid=False)['tx']
|
||||
assert_greater_than_or_equal(tx.vout[0].nValue, amount + fee)
|
||||
tx.vout[0].nValue -= (amount + fee) # change output -> MiniWallet
|
||||
tx.vout.append(CTxOut(amount, scriptPubKey)) # arbitrary output -> to be returned
|
||||
txid = self.sendrawtransaction(from_node=from_node, tx_hex=tx.serialize().hex())
|
||||
return txid, 1
|
||||
|
||||
def create_self_transfer(self, *, fee_rate=Decimal("0.003"), from_node, utxo_to_spend=None, mempool_valid=True, locktime=0, sequence=0):
|
||||
"""Create and return a tx with the specified fee_rate. Fee may be exact or at most one satoshi higher than needed."""
|
||||
self._utxos = sorted(self._utxos, key=lambda k: k['value'])
|
||||
@@ -188,6 +208,14 @@ class MiniWallet:
|
||||
return txid
|
||||
|
||||
|
||||
def random_p2wpkh():
|
||||
"""Generate a random P2WPKH scriptPubKey. Can be used when a random destination is needed,
|
||||
but no compiled wallet is available (e.g. as replacement to the getnewaddress RPC)."""
|
||||
key = ECKey()
|
||||
key.generate()
|
||||
return key_to_p2wpkh_script(key.get_pubkey().get_bytes())
|
||||
|
||||
|
||||
def make_chain(node, address, privkeys, parent_txid, parent_value, n=0, parent_locking_script=None, fee=DEFAULT_FEE):
|
||||
"""Build a transaction that spends parent_txid.vout[n] and produces one output with
|
||||
amount = parent_value with a fee deducted.
|
||||
|
||||
Reference in New Issue
Block a user