From dddc040aa06bec4fe0687ad3890bb1f252e8f5fd Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Fri, 14 Jun 2019 13:18:44 -0400 Subject: [PATCH] s/m_dyna_params/m_dynafed_params/ --- src/block_proof.cpp | 4 ++-- src/chain.h | 6 +++--- src/miner.cpp | 2 +- src/primitives/block.h | 10 +++++----- src/rpc/blockchain.cpp | 4 ++-- src/rpc/mining.cpp | 8 ++++---- src/validation.cpp | 4 ++-- src/wallet/rpcwallet.cpp | 4 ++-- test/functional/test_framework/messages.py | 20 ++++++++++---------- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/block_proof.cpp b/src/block_proof.cpp index 90451a363c..106d55bfe4 100644 --- a/src/block_proof.cpp +++ b/src/block_proof.cpp @@ -47,7 +47,7 @@ static bool CheckProofGeneric(const CBlockHeader& block, const uint32_t max_bloc bool CheckProof(const CBlockHeader& block, const Consensus::Params& params) { if (g_signed_blocks) { - const DynaFedParams& dynafed_params = block.m_dyna_params; + const DynaFedParams& dynafed_params = block.m_dynafed_params; if (dynafed_params.IsNull()) { return CheckProofGeneric(block, params.max_block_signature_size, params.signblockscript, block.proof.solution, CScriptWitness()); } else { @@ -60,7 +60,7 @@ bool CheckProof(const CBlockHeader& block, const Consensus::Params& params) bool CheckProofSignedParent(const CBlockHeader& block, const Consensus::Params& params) { - const DynaFedParams& dynafed_params = block.m_dyna_params; + const DynaFedParams& dynafed_params = block.m_dynafed_params; if (dynafed_params.IsNull()) { return CheckProofGeneric(block, params.max_block_signature_size, params.parent_chain_signblockscript, block.proof.solution, CScriptWitness()); } else { diff --git a/src/chain.h b/src/chain.h index bbc943f2c4..2991d6d462 100644 --- a/src/chain.h +++ b/src/chain.h @@ -272,7 +272,7 @@ public: nBits = block.nBits; nNonce = block.nNonce; proof = block.proof; - dynafed_params = block.m_dyna_params; + dynafed_params = block.m_dynafed_params; m_signblock_witness = block.m_signblock_witness; } @@ -308,7 +308,7 @@ public: block.nBits = nBits; block.nNonce = nNonce; block.proof = proof; - block.m_dyna_params = dynafed_params; + block.m_dynafed_params = dynafed_params; block.m_signblock_witness = m_signblock_witness; return block; } @@ -480,7 +480,7 @@ public: block.nBits = nBits; block.nNonce = nNonce; block.proof = proof; - block.m_dyna_params = dynafed_params; + block.m_dynafed_params = dynafed_params; return block.GetHash(); } diff --git a/src/miner.cpp b/src/miner.cpp index 92d6420717..b202eb9348 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -153,7 +153,7 @@ std::unique_ptr BlockAssembler::CreateNewBlock(const CScript& sc if (IsDynaFedEnabled(pindexPrev, chainparams.GetConsensus())) { DynaFedParamEntry current_params = ComputeNextBlockCurrentParameters(chainActive.Tip(), chainparams.GetConsensus()); DynaFedParams block_params(current_params, proposed_entry ? *proposed_entry : DynaFedParamEntry()); - pblock->m_dyna_params = block_params; + pblock->m_dynafed_params = block_params; nBlockWeight += ::GetSerializeSize(block_params, PROTOCOL_VERSION)*WITNESS_SCALE_FACTOR; nBlockWeight += current_params.m_signblock_witness_limit; // Note witness discount assert(pblock->proof.IsNull()); diff --git a/src/primitives/block.h b/src/primitives/block.h index 7755df89d4..47c399855b 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -190,7 +190,7 @@ public: // Only used pre-dynamic federation CProof proof; // Dynamic federation: Subsumes the proof field - DynaFedParams m_dyna_params; + DynaFedParams m_dynafed_params; CScriptWitness m_signblock_witness; CBlockHeader() @@ -217,7 +217,7 @@ public: this->nVersion = ~DYNAFED_HF_MASK & nVersion; } else { nVersion = this->nVersion; - if (!m_dyna_params.IsNull()) { + if (!m_dynafed_params.IsNull()) { nVersion |= DYNAFED_HF_MASK; is_dyna = true; } @@ -229,7 +229,7 @@ public: READWRITE(hashMerkleRoot); READWRITE(nTime); READWRITE(block_height); - READWRITE(m_dyna_params); + READWRITE(m_dynafed_params); // We do not serialize witness for hashes, or weight calculation if (!(s.GetType() & SER_GETHASH) && fAllowWitness) { READWRITE(m_signblock_witness.stack); @@ -265,7 +265,7 @@ public: bool IsNull() const { if (g_signed_blocks) { - return proof.IsNull() && m_dyna_params.IsNull(); + return proof.IsNull() && m_dynafed_params.IsNull(); } else { return (nBits == 0); } @@ -326,7 +326,7 @@ public: block.nBits = nBits; block.nNonce = nNonce; block.proof = proof; - block.m_dyna_params = m_dyna_params; + block.m_dynafed_params = m_dynafed_params; return block; } diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 4e4e515a40..0d644181fb 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -182,12 +182,12 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIn result.pushKV("difficulty", GetDifficulty(blockindex)); result.pushKV("chainwork", blockindex->nChainWork.GetHex()); } else { - if (block.m_dyna_params.IsNull()) { + if (block.m_dynafed_params.IsNull()) { result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution)); result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution)); result.pushKV("signblock_challenge", HexStr(blockindex->proof.challenge)); } else { - result.pushKV("dynamic_parameters", dynaParamsToJSON(block.m_dyna_params)); + result.pushKV("dynamic_parameters", dynaParamsToJSON(block.m_dynafed_params)); } } result.pushKV("nTx", (uint64_t)blockindex->nTx); diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 7cac47cc69..66a8e13da4 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -144,7 +144,7 @@ UniValue generateBlocks(std::shared_ptr coinbaseScript, int nGen // Fill out block witness if dynamic federation is enabled // since we are assuming WSH(OP_TRUE) - if (!pblock->m_dyna_params.IsNull()) { + if (!pblock->m_dynafed_params.IsNull()) { CScript op_true(OP_TRUE); pblock->m_signblock_witness.stack.push_back(std::vector(op_true.begin(), op_true.end())); } @@ -1083,7 +1083,7 @@ UniValue getnewblockhex(const JSONRPCRequest& request) // If WSH(OP_TRUE) block, fill in witness CScript op_true(OP_TRUE); - if (pblocktemplate->block.m_dyna_params.m_current.m_signblockscript == + if (pblocktemplate->block.m_dynafed_params.m_current.m_signblockscript == GetScriptForDestination(WitnessV0ScriptHash(op_true))) { pblocktemplate->block.m_signblock_witness.stack.push_back(std::vector(op_true.begin(), op_true.end())); } @@ -1153,7 +1153,7 @@ UniValue combineblocksigs(const JSONRPCRequest& request) sig_data.signatures[pubkey.GetID()] = std::make_pair(pubkey, sig_bytes); } - if (!block.m_dyna_params.IsNull()) { + if (!block.m_dynafed_params.IsNull()) { if (request.params[2].isNull()) { throw JSONRPCError(RPC_INVALID_PARAMETER, "Signing dynamic blocks requires the witnessScript argument"); } @@ -1162,7 +1162,7 @@ UniValue combineblocksigs(const JSONRPCRequest& request) keystore.AddCScript(CScript(witness_bytes.begin(), witness_bytes.end())); } // Finalizes the signatures, has no access to keys - ProduceSignature(keystore, signature_creator, block.m_dyna_params.m_current.m_signblockscript, sig_data, SCRIPT_NO_SIGHASH_BYTE); + ProduceSignature(keystore, signature_creator, block.m_dynafed_params.m_current.m_signblockscript, sig_data, SCRIPT_NO_SIGHASH_BYTE); block.m_signblock_witness = sig_data.scriptWitness; } else { // Finalizes the signatures, has no access to keys diff --git a/src/validation.cpp b/src/validation.cpp index 309a50e004..7aff449575 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2131,7 +2131,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl // ELEMENTS: // Enforce PAK post-dynafed - if (chainparams.GetEnforcePak() && !block.m_dyna_params.IsNull()) { + if (chainparams.GetEnforcePak() && !block.m_dynafed_params.IsNull()) { // GetActivePAKList computes for the following block, so use previous index CPAKList paklist = GetActivePAKList(pindex->pprev, chainparams.GetConsensus()); for (const auto& tx : block.vtx) { @@ -3472,7 +3472,7 @@ static bool ContextualCheckDynaFedHeader(const CBlockHeader& block, CValidationS return true; } - const DynaFedParams& dynafed_params = block.m_dyna_params; + const DynaFedParams& dynafed_params = block.m_dynafed_params; // Dynamic blocks must at least publish current signblockscript in full if (dynafed_params.m_current.IsNull()) { diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 5c9c705a21..7eb3ae9408 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -4782,7 +4782,7 @@ UniValue signblock(const JSONRPCRequest& request) // Expose SignatureData internals in return value in lieu of "Partially Signed Bitcoin Blocks" SignatureData block_sigs; - if (block.m_dyna_params.IsNull()) { + if (block.m_dynafed_params.IsNull()) { GenericSignScript(*pwallet, block.GetBlockHeader(), block.proof.challenge, block_sigs); } else { if (request.params[1].isNull()) { @@ -4794,7 +4794,7 @@ UniValue signblock(const JSONRPCRequest& request) if (!witness_bytes.empty()) { pwallet->AddCScript(CScript(witness_bytes.begin(), witness_bytes.end())); } - GenericSignScript(*pwallet, block.GetBlockHeader(), block.m_dyna_params.m_current.m_signblockscript, block_sigs); + GenericSignScript(*pwallet, block.GetBlockHeader(), block.m_dynafed_params.m_current.m_signblockscript, block_sigs); } // Error if sig data didn't "grow" diff --git a/test/functional/test_framework/messages.py b/test/functional/test_framework/messages.py index 6a5e51861b..1622fdc2fb 100755 --- a/test/functional/test_framework/messages.py +++ b/test/functional/test_framework/messages.py @@ -928,7 +928,7 @@ HEADER_HF_BIT = 1 << 31 HEADER_DYNAFED_HF_MASK = 0x7fffffff class CBlockHeader: __slots__ = ("hash", "hashMerkleRoot", "hashPrevBlock", "nBits", "nNonce", - "nTime", "nVersion", "sha256", "block_height", "proof", "m_dyna_params", + "nTime", "nVersion", "sha256", "block_height", "proof", "m_dynafed_params", "m_signblock_witness") def __init__(self, header=None): @@ -943,7 +943,7 @@ class CBlockHeader: self.proof = header.proof self.sha256 = header.sha256 self.hash = header.hash - self.m_dyna_params = header.m_dyna_params + self.m_dynafed_params = header.m_dynafed_params self.m_signblock_witness = header.m_signblock_witness self.calc_sha256() @@ -954,7 +954,7 @@ class CBlockHeader: self.nTime = 0 self.block_height = 0 self.proof = CProof() - self.m_dyna_params = DynaFedParams() + self.m_dynafed_params = DynaFedParams() self.m_signblock_witness = CScriptWitness() self.sha256 = None self.hash = None @@ -972,7 +972,7 @@ class CBlockHeader: self.nTime = struct.unpack("