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

Deprecate con_dyna_deploy_start in favor of evbparams

Browse source
This commit is contained in:
Pablo Greco 2021-10-29 17:23:07 +00:00
parent d15d08c605
commit 85c3c2b819
11 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/assets_tutorial/assets_tutorial.py
View file

@ -482,7 +482,7 @@ extra_args = [
"-con_max_block_sig_size=150",
# We also disable dynamic federations, since we are not going to do any
# dynafed transitions in this tutorial. FIXME we probably should.
"-con_dyna_deploy_start=0",
"-evbparams=dynafed:0:::",
]
print ("6b. Restart both nodes")

10
src/chainparams.cpp
View file

@ -839,7 +839,7 @@ class CCustomParams : public CRegTestParams {
}
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 25;
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = args.GetArg("-con_dyna_deploy_start", Consensus::BIP9Deployment::ALWAYS_ACTIVE);
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE;
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
UpdateElementsActivationParametersFromArgs(consensus, args);
@ -1361,11 +1361,9 @@ public:
consensus.subsidy_asset = CAsset(uint256S(args.GetArg("-subsidyasset", "")));
}
if (args.IsArgSet("-con_dyna_deploy_start")) {
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 25;
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = args.GetArg("-con_dyna_deploy_start", Consensus::BIP9Deployment::ALWAYS_ACTIVE);
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
}
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 25;
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE;
consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
UpdateElementsActivationParametersFromArgs(consensus, args);

1
src/chainparamsbase.cpp
View file

@ -56,7 +56,6 @@ void SetupChainParamsBaseOptions(ArgsManager& argsman)
argsman.AddArg("-pak", "Sets the 'first extension space' field to the pak entries ala pre-dynamic federations. Only used for testing in custom chains.", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
argsman.AddArg("-multi_data_permitted", "Allow relay of multiple OP_RETURN outputs. (default: -enforce_pak)", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
argsman.AddArg("-con_csv_deploy_start", "Starting height for CSV deployment. (default: -1, which means ACTIVE from genesis)", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
argsman.AddArg("-con_dyna_deploy_start", "Starting height for Dynamic Federations deployment. Once active, signblockscript becomes a BIP141 WSH scriptPubKey of the original signblockscript. All other dynamic parameters stay constant.(default: -1, which means ACTIVE from genesis)", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
argsman.AddArg("-con_dyna_deploy_signal", "Whether to signal for the Dynamic Federations deployment (default: true).", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
argsman.AddArg("-dynamic_epoch_length", "Per-chain parameter that sets how many blocks dynamic federation voting and enforcement are in effect for.", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);
argsman.AddArg("-total_valid_epochs", "Per-chain parameter that sets how long a particular fedpegscript is in effect for.", ArgsManager::ALLOW_ANY, OptionsCategory::ELEMENTS);

2
test/bitcoin_functional/functional/test_framework/util.py
View file

@ -322,7 +322,7 @@ def initialize_datadir(dirname, n):
f.write("pubkeyprefix=111\n")
f.write("scriptprefix=196\n")
f.write("bech32_hrp=bcrt\n")
f.write("con_dyna_deploy_start="+str(2**31)+"\n") # Never starts
f.write("evbparams=dynafed:"+str(2**31)+":::\n") # Never starts
f.write("minrelaytxfee=0.00001\n")
os.makedirs(os.path.join(datadir, 'stderr'), exist_ok=True)
os.makedirs(os.path.join(datadir, 'stdout'), exist_ok=True)

2
test/functional/feature_blocksign.py
View file

@ -82,7 +82,7 @@ class BlockSignTest(BitcoinTestFramework):
"-signblockscript={}".format(signblockscript),
"-con_max_block_sig_size={}".format(self.required_signers*74+self.num_nodes*33),
"-anyonecanspendaremine=1",
"-con_dyna_deploy_start=0",
"-evbparams=dynafed:0:::",
"-con_dyna_deploy_signal=1",
]] * self.num_nodes

4
test/functional/feature_dynafed.py
View file

@ -67,7 +67,7 @@ class DynaFedTest(BitcoinTestFramework):
self.num_nodes = 2
# We want to test activation of dynafed
self.extra_args = [[
"-con_dyna_deploy_start=1000",
"-evbparams=dynafed:1000:::",
"-enforce_pak=1",
"-con_parent_chain_signblockscript=51",
"-peginconfirmationdepth=1",
@ -78,7 +78,7 @@ class DynaFedTest(BitcoinTestFramework):
# second node will not mine transactions
self.extra_args[1].append("-blocksonly=1")
# Make sure nothing breaks if peers have a different activation.
self.extra_args[1][0] = "-con_dyna_deploy_start=937"
self.extra_args[1][0] = "-evbparams=dynafed:937:::"
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()

2
test/functional/feature_fedpeg.py
View file

@ -140,7 +140,7 @@ class FedPegTest(BitcoinTestFramework):
# Immediate activation of dynafed when requested versus "never" from conf
if self.options.pre_transition or self.options.post_transition:
extra_args.extend(["-con_dyna_deploy_start=-1"])
extra_args.extend(["-evbparams=dynafed:-1:::"])
# Use rpcuser auth only for first parent.
if n==0:

2
test/functional/feature_pak.py
View file

@ -18,7 +18,7 @@ class PAKTest (BitcoinTestFramework):
def set_test_params(self):
self.num_nodes = 3
self.setup_clean_chain = True
self.extra_args = [["-enforce_pak=1", "-con_dyna_deploy_start=-1", "-initialfreecoins=210000000000000", "-anyonecanspendaremine=1", "-parent_bech32_hrp=lol", "-pubkeyprefix=112", "-scriptprefix=197", "-con_connect_genesis_outputs=1"] for i in range(self.num_nodes)]
self.extra_args = [["-enforce_pak=1", "-evbparams=dynafed:-1:::", "-initialfreecoins=210000000000000", "-anyonecanspendaremine=1", "-parent_bech32_hrp=lol", "-pubkeyprefix=112", "-scriptprefix=197", "-con_connect_genesis_outputs=1"] for i in range(self.num_nodes)]
# First node doesn't enforce PAK, a "HF" of the other two nodes
self.extra_args[0] = ["-acceptnonstdtxn=1"] + self.extra_args[0][1:] ## FIXME -acceptnonstdtxn=1 should not be needed

2
test/functional/feature_sighash_rangeproof.py
View file

@ -51,7 +51,7 @@ class SighashRangeproofTest(BitcoinTestFramework):
self.num_nodes = 3
# We want to test activation of dynafed
self.extra_args = [[
"-con_dyna_deploy_start=1000",
"-evbparams=dynafed:1000:::",
"-con_dyna_deploy_signal=1",
"-blindedaddresses=1",
"-initialfreecoins=2100000000000000",

2
test/functional/rpc_tweakfedpeg.py
View file

@ -26,7 +26,7 @@ class TweakFedpegTest(BitcoinTestFramework):
[
"-fedpegscript="+LIQUID_SCRIPT,
"-con_dyna_deploy_signal=1",
"-con_dyna_deploy_start=0", # test dynafed derivation
"-evbparams=dynafed:0:::", # test dynafed derivation
]]
def setup_network(self):

2
test/functional/test_framework/util.py
View file

@ -381,7 +381,7 @@ def initialize_datadir(dirname, n, chain):
f.write("con_bip65height=1351\n")
f.write("con_bip66height=1251\n")
f.write("blindedaddresses=0\n") # Set to minimize broken tests in favor of custom
f.write("con_dyna_deploy_start="+str(2**31)+"\n") # Never starts unless overridden
f.write("evbparams=dynafed:"+str(2**31)+":::\n") # Never starts unless overridden
f.write("minrelaytxfee=0.00001\n")
#f.write("pubkeyprefix=111\n")
#f.write("scriptprefix=196\n")