Skip to content

Commit b2cde07

Browse files
UdjinM6claude
andcommitted
test, doc: address review suggestions for spork removal
- Update release notes to clarify that SPORK_3 and SPORK_9 were already effectively always enabled on mainnet but continued to gate behavior on test networks. - Add explicit wait_until(IsSynced) in feature_dip3_deterministicmns before the getblocktemplate loop, since -budgetparams=10:10:10 sets superblock cycle to 10 blocks and getblocktemplate now unconditionally checks IsSynced() at superblock heights. - Fix stale comment in DashTestFramework that still referenced "block filtering" after SPORK_3 removal. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 3d9e80e commit b2cde07

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

doc/release-notes-7278.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ Removed Sporks
22
--------------
33

44
* `SPORK_3_INSTANTSEND_BLOCK_FILTERING` and `SPORK_9_SUPERBLOCKS_ENABLED` have
5-
been removed. The behaviours they gated (InstantSend conflicting-block
6-
rejection and superblock payments) are now always enabled. These sporks will
7-
no longer appear in the output of the `spork` RPC.
5+
been removed. These sporks were already effectively always enabled on mainnet
6+
but continued to gate behavior on test networks (testnet, regtest, and devnet).
7+
The associated functionality (InstantSend conflicting-block rejection and
8+
superblock payments) is now permanently enabled across all networks, and the
9+
sporks will no longer appear in the `spork` RPC output.
810

911
Updated RPCs
1012
------------

test/functional/feature_dip3_deterministicmns.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ def run_test(self):
173173

174174
multisig = self.nodes[0].createmultisig(1, [addr1Obj['pubkey'], addr2Obj['pubkey']])['address']
175175
self.update_mn_payee(mns[0], multisig)
176+
self.wait_until(lambda: self.nodes[0].mnsync("status")['IsSynced'])
176177
found_multisig_payee = False
177178
for _ in range(len(mns)):
178179
bt = self.nodes[0].getblocktemplate()

test/functional/test_framework/test_framework.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1844,7 +1844,7 @@ def setup_network(self):
18441844
for i in range(1, num_simple_nodes):
18451845
force_finish_mnsync(self.nodes[i])
18461846

1847-
# Enable InstantSend (including block filtering) and ChainLocks by default
1847+
# Enable InstantSend and ChainLocks by default
18481848
self.nodes[0].sporkupdate("SPORK_2_INSTANTSEND_ENABLED", 0)
18491849
self.nodes[0].sporkupdate("SPORK_19_CHAINLOCKS_ENABLED", 0)
18501850
self.wait_for_sporks_same()

0 commit comments

Comments
 (0)