mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 12:32:48 +01:00
4e81732c57
faa137eb9eac5554504b062a6dc865ca87fd572b test: Speed up rpc_blockchain.py by removing miniwallet.generate() (MarcoFalke)
fa1fe80c757df0adcbfaf41b5c5c8a468bc07b6f test: Change address type from P2PKH to P2WSH in rpc_blockchain (MarcoFalke)
fa4d8f3169e38cbdbae20258efebe7070c49f522 test: Cache 25 mature coins for ADDRESS_BCRT1_P2WSH_OP_TRUE (MarcoFalke)
fad25153f5c8e88f72cf666b16b0b0dbdc45d3b1 test: Remove unused bug workaround (MarcoFalke)
faabce7d07c5776e4116b1a7ad1f6c408a4a4e46 test: Start only the number of nodes that are needed (MarcoFalke)
Pull request description:
Speed up various tests:
* Remove unused nodes, which only consume time on start/stop
* Remove unused "bug workarounds"
* Remove the need for `miniwallet.generate()` by adding `miniwallet.scan_blocks()`. (On my system, with valgrind, generating 105 blocks takes 3.31 seconds. Rescanning 5 blocks takes 0.11 seconds.)
ACKs for top commit:
laanwj:
Code review ACK faa137eb9eac5554504b062a6dc865ca87fd572b
Tree-SHA512: ead1988d5aaa748ef9f8520af1e0bf812cf1d72e281ad22fbd172b7306d850053040526f8adbcec0b9a971c697a0ee7ee8962684644d65b791663eedd505a025
91 lines
3.7 KiB
Python
91 lines
3.7 KiB
Python
#!/usr/bin/env python3
|
|
# Copyright (c) 2020 The Bitcoin Core developers
|
|
# Distributed under the MIT software license, see the accompanying
|
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
"""A limited-functionality wallet, which may replace a real wallet in tests"""
|
|
|
|
from decimal import Decimal
|
|
from test_framework.address import ADDRESS_BCRT1_P2SH_OP_TRUE
|
|
from typing import Optional
|
|
from test_framework.messages import (
|
|
COIN,
|
|
COutPoint,
|
|
CTransaction,
|
|
CTxIn,
|
|
CTxOut,
|
|
)
|
|
from test_framework.script import (
|
|
CScript,
|
|
OP_TRUE,
|
|
)
|
|
from test_framework.util import (
|
|
assert_equal,
|
|
hex_str_to_bytes,
|
|
satoshi_round,
|
|
)
|
|
|
|
|
|
class MiniWallet:
|
|
def __init__(self, test_node):
|
|
self._test_node = test_node
|
|
self._utxos = []
|
|
self._address = ADDRESS_BCRT1_P2SH_OP_TRUE
|
|
self._scriptPubKey = hex_str_to_bytes(self._test_node.validateaddress(self._address)['scriptPubKey'])
|
|
|
|
def scan_blocks(self, *, start=1, num):
|
|
"""Scan the blocks for self._address outputs and add them to self._utxos"""
|
|
for i in range(start, start + num):
|
|
block = self._test_node.getblock(blockhash=self._test_node.getblockhash(i), verbosity=2)
|
|
for tx in block['tx']:
|
|
for out in tx['vout']:
|
|
if out['scriptPubKey']['hex'] == self._scriptPubKey.hex():
|
|
self._utxos.append({'txid': tx['txid'], 'vout': out['n'], 'value': out['value']})
|
|
|
|
def generate(self, num_blocks):
|
|
"""Generate blocks with coinbase outputs to the internal address, and append the outputs to the internal list"""
|
|
blocks = self._test_node.generatetoaddress(num_blocks, self._address)
|
|
for b in blocks:
|
|
cb_tx = self._test_node.getblock(blockhash=b, verbosity=2)['tx'][0]
|
|
self._utxos.append({'txid': cb_tx['txid'], 'vout': 0, 'value': cb_tx['vout'][0]['value']})
|
|
return blocks
|
|
|
|
def get_address(self):
|
|
return self._address
|
|
|
|
def get_utxo(self, *, txid: Optional[str]=''):
|
|
"""
|
|
Returns a utxo and marks it as spent (pops it from the internal list)
|
|
|
|
Args:
|
|
txid: get the first utxo we find from a specific transaction
|
|
|
|
Note: Can be used to get the change output immediately after a send_self_transfer
|
|
"""
|
|
index = -1 # by default the last utxo
|
|
if txid:
|
|
utxo = next(filter(lambda utxo: txid == utxo['txid'], self._utxos))
|
|
index = self._utxos.index(utxo)
|
|
return self._utxos.pop(index)
|
|
|
|
def send_self_transfer(self, *, fee_rate=Decimal("0.003"), from_node, utxo_to_spend=None):
|
|
"""Create and send 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'])
|
|
utxo_to_spend = utxo_to_spend or self._utxos.pop() # Pick the largest utxo (if none provided) and hope it covers the fee
|
|
vsize = Decimal(85)
|
|
send_value = satoshi_round(utxo_to_spend['value'] - fee_rate * (vsize / 1000))
|
|
fee = utxo_to_spend['value'] - send_value
|
|
assert send_value > 0
|
|
|
|
tx = CTransaction()
|
|
tx.vin = [CTxIn(COutPoint(int(utxo_to_spend['txid'], 16), utxo_to_spend['vout']))]
|
|
tx.vout = [CTxOut(int(send_value * COIN), self._scriptPubKey)]
|
|
tx.vin[0].scriptSig = CScript([CScript([OP_TRUE])])
|
|
tx_hex = tx.serialize().hex()
|
|
|
|
tx_info = from_node.testmempoolaccept([tx_hex])[0]
|
|
self._utxos.append({'txid': tx_info['txid'], 'vout': 0, 'value': send_value})
|
|
from_node.sendrawtransaction(tx_hex)
|
|
assert_equal(len(tx_hex) // 2, vsize)
|
|
assert_equal(tx_info['fees']['base'], fee)
|
|
return {'txid': tx_info['txid'], 'hex': tx_hex}
|