highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-25 05:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#31897: mining: drop unused -nFees and sigops from CBlockTemplate

Browse Source 
226d81f8b7 mining: drop unused -nFees and sigops from CBlockTemplate (Sjors Provoost)
53ad845fb9 test: check fees and sigops in getblocktemplate (Sjors Provoost)

Pull request description:

  For the coinbase `vTxFees` used a dummy value of -nFees.

  Similarly the first `vTxSigOpsCost` entry was calculated from
  the dummy coinbase transaction.

  This was introduced in #2115, but the values were never returned by the RPC or used in a test.

  Drop 'm and add code comments to prevent confusion.

  This PR also adds test coverage for the `fees` and `sigops` fields in `getblocktemplate`, so it closes #32053.

ACKs for top commit:
  ismaelsadeeq:
    re-ACK 226d81f8b7
  ryanofsky:
    Code review ACK 226d81f8b7. New test was added since last review, which seems very cleanly written and fixes some missing coverage.
  glozow:
    ACK 226d81f8b7

Tree-SHA512: 79c534e6bc4810d29114b04dd6db798877732cb473e773bf3cc28f83d14ee3982392587bd0baa39857bd53a79eae3b730d7a7029b08a9b6c3b5c51f86657ca5d
This commit is contained in:
merge-script
2025-03-25 08:41:59 -04:00
parent 1d281daf86 226d81f8b7
commit dfb7d58108
5 changed files with 64 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
test/functional/mining_basic.py
View File

@@ -40,7 +40,10 @@ from test_framework.util import (
assert_raises_rpc_error,
get_fee,
)
from test_framework.wallet import MiniWallet
from test_framework.wallet import (
MiniWallet,
MiniWalletMode,
)
DIFFICULTY_ADJUSTMENT_INTERVAL = 144
@@ -93,6 +96,57 @@ class MiningTest(BitcoinTestFramework):
self.restart_node(0)
self.connect_nodes(0, 1)
def test_fees_and_sigops(self):
self.log.info("Test fees and sigops in getblocktemplate result")
node = self.nodes[0]
# Generate a coinbases with p2pk transactions for its sigops.
wallet_sigops = MiniWallet(node, mode=MiniWalletMode.RAW_P2PK)
self.generate(wallet_sigops, 1, sync_fun=self.no_op)
# Mature with regular coinbases to prevent inteference with other tests
self.generate(self.wallet, 100, sync_fun=self.no_op)
# Generate three transactions that must be mined in sequence
#
# tx_a (1 sat/vbyte)
# |
# |
# tx_b (2 sat/vbyte)
# |
# |
# tx_c (3 sat/vbyte)
#
tx_a = wallet_sigops.send_self_transfer(from_node=node,
fee_rate=Decimal("0.00001"))
tx_b = wallet_sigops.send_self_transfer(from_node=node,
fee_rate=Decimal("0.00002"),
utxo_to_spend=tx_a["new_utxo"])
tx_c = wallet_sigops.send_self_transfer(from_node=node,
fee_rate=Decimal("0.00003"),
utxo_to_spend=tx_b["new_utxo"])
# Generate transaction without sigops. It will go first because it pays
# higher fees (100 sat/vbyte) and descends from a different coinbase.
tx_d = self.wallet.send_self_transfer(from_node=node,
fee_rate=Decimal("0.00100"))
block_template_txs = node.getblocktemplate(NORMAL_GBT_REQUEST_PARAMS)['transactions']
block_template_fees = [tx['fee'] for tx in block_template_txs]
assert_equal(block_template_fees, [
tx_d["fee"] * COIN,
tx_a["fee"] * COIN,
tx_b["fee"] * COIN,
tx_c["fee"] * COIN
])
block_template_sigops = [tx['sigops'] for tx in block_template_txs]
assert_equal(block_template_sigops, [0, 4, 4, 4])
# Clear mempool
self.generate(self.wallet, 1, sync_fun=self.no_op)
def test_blockmintxfee_parameter(self):
self.log.info("Test -blockmintxfee setting")
self.restart_node(0, extra_args=['-minrelaytxfee=0', '-persistmempool=0'])
@@ -533,6 +587,7 @@ class MiningTest(BitcoinTestFramework):
node.submitheader(hexdata=CBlockHeader(bad_block_root).serialize().hex())
assert_equal(node.submitblock(hexdata=block.serialize().hex()), 'duplicate') # valid
self.test_fees_and_sigops()
self.test_blockmintxfee_parameter()
self.test_block_max_weight()
self.test_timewarp()