GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 03b8b0cb91 into merged_master (Elements PR ElementsProject/elements#1111)

Browse source
This commit is contained in:
Glenn Willen 2022-06-27 13:11:53 -07:00
commit 7754db44e4
4 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/blockchain.cpp
View file

@ -1588,10 +1588,8 @@ RPCHelpMan getblockchaininfo()
obj.pushKV("size_on_disk", CalculateCurrentUsage());
obj.pushKV("pruned", fPruneMode);
if (g_signed_blocks) {
CScript sign_block_script = chainparams.GetConsensus().signblockscript;
obj.pushKV("signblock_asm", ScriptToAsmStr(sign_block_script));
obj.pushKV("signblock_hex", HexStr(sign_block_script));
if (!DeploymentActiveAfter(tip, chainparams.GetConsensus(), Consensus::DEPLOYMENT_DYNA_FED)) {
CScript sign_block_script = chainparams.GetConsensus().signblockscript;
obj.pushKV("current_signblock_asm", ScriptToAsmStr(sign_block_script));
obj.pushKV("current_signblock_hex", HexStr(sign_block_script));
obj.pushKV("max_block_witness", (uint64_t)chainparams.GetConsensus().max_block_signature_size);

5
test/functional/feature_blocksign.py
View file

@ -111,7 +111,6 @@ class BlockSignTest(BitcoinTestFramework):
if is_dyna:
wsh_wrap = self.nodes[0].decodescript(self.witnessScript)['segwit']['hex']
assert_equal(wsh_wrap, blockchain_info['current_signblock_hex'])
assert blockchain_info['current_signblock_hex'] != blockchain_info['signblock_hex']
# Make a few transactions to make non-empty blocks for compact transmission
if make_transactions:
@ -207,10 +206,6 @@ class BlockSignTest(BitcoinTestFramework):
assert 'signblock_witness_asm' in block
assert 'signblock_witness_hex' in block
signblockscript = make_signblockscript(self.num_keys, self.required_signers, self.keys)
assert_equal(info['signblock_asm'], self.nodes[0].decodescript(signblockscript)['asm'])
assert_equal(info['signblock_hex'], signblockscript)
assert_equal(info['softforks']['dynafed']['bip9']['status'], "defined")
# Next let's activate dynafed

1
test/functional/feature_dynafed.py
View file

@ -100,7 +100,6 @@ class DynaFedTest(BitcoinTestFramework):
# blocksigner is OP_TRUE, extension space is hardcoded one in chainparams
signblock_info = self.nodes[i].getblockchaininfo()
assert_equal(signblock_info["signblock_hex"], "51")
assert_equal(signblock_info["current_signblock_hex"], "51")
assert_equal(signblock_info["max_block_witness"], 74)
assert_equal(signblock_info["extension_space"], initial_extension)

2
test/functional/rpc_blockchain.py
View file

@ -85,8 +85,6 @@ class BlockchainTest(BitcoinTestFramework):
'max_block_witness',
'mediantime',
'pruned',
'signblock_asm',
'signblock_hex',
'size_on_disk',
'softforks',
'verificationprogress',