Skip to content

Commit 285daab

Browse files
instagibbsinstagibbs
committed
s/m_dyna_params/m_dynafed_params/
1 parent e963834 commit 285daab

File tree

9 files changed

+31
-31
lines changed

9 files changed

+31
-31
lines changed

‎src/block_proof.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static bool CheckProofGeneric(const CBlockHeader& block, const uint32_t max_bloc
4747
bool CheckProof(const CBlockHeader& block, const Consensus::Params& params)
4848
{
4949
if (g_signed_blocks) {
50-
const DynaFedParams& dynafed_params = block.m_dyna_params;
50+
const DynaFedParams& dynafed_params = block.m_dynafed_params;
5151
if (dynafed_params.IsNull()) {
5252
return CheckProofGeneric(block, params.max_block_signature_size, params.signblockscript, block.proof.solution, CScriptWitness());
5353
} else {
@@ -60,7 +60,7 @@ bool CheckProof(const CBlockHeader& block, const Consensus::Params& params)
6060

6161
bool CheckProofSignedParent(const CBlockHeader& block, const Consensus::Params& params)
6262
{
63-
const DynaFedParams& dynafed_params = block.m_dyna_params;
63+
const DynaFedParams& dynafed_params = block.m_dynafed_params;
6464
if (dynafed_params.IsNull()) {
6565
return CheckProofGeneric(block, params.max_block_signature_size, params.parent_chain_signblockscript, block.proof.solution, CScriptWitness());
6666
} else {

‎src/chain.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class CBlockIndex
272272
nBits = block.nBits;
273273
nNonce = block.nNonce;
274274
proof = block.proof;
275-
dynafed_params = block.m_dyna_params;
275+
dynafed_params = block.m_dynafed_params;
276276
m_signblock_witness = block.m_signblock_witness;
277277
}
278278

@@ -308,7 +308,7 @@ class CBlockIndex
308308
block.nBits = nBits;
309309
block.nNonce = nNonce;
310310
block.proof = proof;
311-
block.m_dyna_params = dynafed_params;
311+
block.m_dynafed_params = dynafed_params;
312312
block.m_signblock_witness = m_signblock_witness;
313313
return block;
314314
}
@@ -480,7 +480,7 @@ class CDiskBlockIndex : public CBlockIndex
480480
block.nBits = nBits;
481481
block.nNonce = nNonce;
482482
block.proof = proof;
483-
block.m_dyna_params = dynafed_params;
483+
block.m_dynafed_params = dynafed_params;
484484
return block.GetHash();
485485
}
486486

‎src/miner.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
153153
if (IsDynaFedEnabled(pindexPrev, chainparams.GetConsensus())) {
154154
DynaFedParamEntry current_params = ComputeNextBlockCurrentParameters(chainActive.Tip(), chainparams.GetConsensus());
155155
DynaFedParams block_params(current_params, proposed_entry ? *proposed_entry : DynaFedParamEntry());
156-
pblock->m_dyna_params = block_params;
156+
pblock->m_dynafed_params = block_params;
157157
nBlockWeight += ::GetSerializeSize(block_params, PROTOCOL_VERSION)*WITNESS_SCALE_FACTOR;
158158
nBlockWeight += current_params.m_signblock_witness_limit; // Note witness discount
159159
assert(pblock->proof.IsNull());

‎src/primitives/block.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ class CBlockHeader
190190
// Only used pre-dynamic federation
191191
CProof proof;
192192
// Dynamic federation: Subsumes the proof field
193-
DynaFedParams m_dyna_params;
193+
DynaFedParams m_dynafed_params;
194194
CScriptWitness m_signblock_witness;
195195

196196
CBlockHeader()
@@ -217,7 +217,7 @@ class CBlockHeader
217217
this->nVersion = ~DYNAFED_HF_MASK & nVersion;
218218
} else {
219219
nVersion = this->nVersion;
220-
if (!m_dyna_params.IsNull()) {
220+
if (!m_dynafed_params.IsNull()) {
221221
nVersion |= DYNAFED_HF_MASK;
222222
is_dyna = true;
223223
}
@@ -229,7 +229,7 @@ class CBlockHeader
229229
READWRITE(hashMerkleRoot);
230230
READWRITE(nTime);
231231
READWRITE(block_height);
232-
READWRITE(m_dyna_params);
232+
READWRITE(m_dynafed_params);
233233
// We do not serialize witness for hashes, or weight calculation
234234
if (!(s.GetType() & SER_GETHASH) && fAllowWitness) {
235235
READWRITE(m_signblock_witness.stack);
@@ -265,7 +265,7 @@ class CBlockHeader
265265
bool IsNull() const
266266
{
267267
if (g_signed_blocks) {
268-
return proof.IsNull() && m_dyna_params.IsNull();
268+
return proof.IsNull() && m_dynafed_params.IsNull();
269269
} else {
270270
return (nBits == 0);
271271
}
@@ -326,7 +326,7 @@ class CBlock : public CBlockHeader
326326
block.nBits = nBits;
327327
block.nNonce = nNonce;
328328
block.proof = proof;
329-
block.m_dyna_params = m_dyna_params;
329+
block.m_dynafed_params = m_dynafed_params;
330330
return block;
331331
}
332332

‎src/rpc/blockchain.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIn
182182
result.pushKV("difficulty", GetDifficulty(blockindex));
183183
result.pushKV("chainwork", blockindex->nChainWork.GetHex());
184184
} else {
185-
if (block.m_dyna_params.IsNull()) {
185+
if (block.m_dynafed_params.IsNull()) {
186186
result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution));
187187
result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution));
188188
result.pushKV("signblock_challenge", HexStr(blockindex->proof.challenge));
189189
} else {
190-
result.pushKV("dynamic_parameters", dynaParamsToJSON(block.m_dyna_params));
190+
result.pushKV("dynamic_parameters", dynaParamsToJSON(block.m_dynafed_params));
191191
}
192192
}
193193
result.pushKV("nTx", (uint64_t)blockindex->nTx);

‎src/rpc/mining.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ UniValue generateBlocks(std::shared_ptr<CReserveScript> coinbaseScript, int nGen
144144

145145
// Fill out block witness if dynamic federation is enabled
146146
// since we are assuming WSH(OP_TRUE)
147-
if (!pblock->m_dyna_params.IsNull()) {
147+
if (!pblock->m_dynafed_params.IsNull()) {
148148
CScript op_true(OP_TRUE);
149149
pblock->m_signblock_witness.stack.push_back(std::vector<unsigned char>(op_true.begin(), op_true.end()));
150150
}
@@ -1083,7 +1083,7 @@ UniValue getnewblockhex(const JSONRPCRequest& request)
10831083

10841084
// If WSH(OP_TRUE) block, fill in witness
10851085
CScript op_true(OP_TRUE);
1086-
if (pblocktemplate->block.m_dyna_params.m_current.m_signblockscript ==
1086+
if (pblocktemplate->block.m_dynafed_params.m_current.m_signblockscript ==
10871087
GetScriptForDestination(WitnessV0ScriptHash(op_true))) {
10881088
pblocktemplate->block.m_signblock_witness.stack.push_back(std::vector<unsigned char>(op_true.begin(), op_true.end()));
10891089
}
@@ -1153,7 +1153,7 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
11531153
sig_data.signatures[pubkey.GetID()] = std::make_pair(pubkey, sig_bytes);
11541154
}
11551155

1156-
if (!block.m_dyna_params.IsNull()) {
1156+
if (!block.m_dynafed_params.IsNull()) {
11571157
if (request.params[2].isNull()) {
11581158
throw JSONRPCError(RPC_INVALID_PARAMETER, "Signing dynamic blocks requires the witnessScript argument");
11591159
}
@@ -1162,7 +1162,7 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
11621162
keystore.AddCScript(CScript(witness_bytes.begin(), witness_bytes.end()));
11631163
}
11641164
// Finalizes the signatures, has no access to keys
1165-
ProduceSignature(keystore, signature_creator, block.m_dyna_params.m_current.m_signblockscript, sig_data, SCRIPT_NO_SIGHASH_BYTE);
1165+
ProduceSignature(keystore, signature_creator, block.m_dynafed_params.m_current.m_signblockscript, sig_data, SCRIPT_NO_SIGHASH_BYTE);
11661166
block.m_signblock_witness = sig_data.scriptWitness;
11671167
} else {
11681168
// Finalizes the signatures, has no access to keys

‎src/validation.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2131,7 +2131,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
21312131
// ELEMENTS:
21322132

21332133
// Enforce PAK post-dynafed
2134-
if (chainparams.GetEnforcePak() && !block.m_dyna_params.IsNull()) {
2134+
if (chainparams.GetEnforcePak() && !block.m_dynafed_params.IsNull()) {
21352135
// GetActivePAKList computes for the following block, so use previous index
21362136
CPAKList paklist = GetActivePAKList(pindex->pprev, chainparams.GetConsensus());
21372137
for (const auto& tx : block.vtx) {
@@ -3466,7 +3466,7 @@ static bool ContextualCheckDynaFedHeader(const CBlockHeader& block, CValidationS
34663466
return true;
34673467
}
34683468

3469-
const DynaFedParams& dynafed_params = block.m_dyna_params;
3469+
const DynaFedParams& dynafed_params = block.m_dynafed_params;
34703470

34713471
// Dynamic blocks must at least publish current signblockscript in full
34723472
if (dynafed_params.m_current.IsNull()) {

‎src/wallet/rpcwallet.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4777,7 +4777,7 @@ UniValue signblock(const JSONRPCRequest& request)
47774777

47784778
// Expose SignatureData internals in return value in lieu of "Partially Signed Bitcoin Blocks"
47794779
SignatureData block_sigs;
4780-
if (block.m_dyna_params.IsNull()) {
4780+
if (block.m_dynafed_params.IsNull()) {
47814781
GenericSignScript(*pwallet, block.GetBlockHeader(), block.proof.challenge, block_sigs);
47824782
} else {
47834783
if (request.params[1].isNull()) {
@@ -4789,7 +4789,7 @@ UniValue signblock(const JSONRPCRequest& request)
47894789
if (!witness_bytes.empty()) {
47904790
pwallet->AddCScript(CScript(witness_bytes.begin(), witness_bytes.end()));
47914791
}
4792-
GenericSignScript(*pwallet, block.GetBlockHeader(), block.m_dyna_params.m_current.m_signblockscript, block_sigs);
4792+
GenericSignScript(*pwallet, block.GetBlockHeader(), block.m_dynafed_params.m_current.m_signblockscript, block_sigs);
47934793
}
47944794

47954795
// Error if sig data didn't "grow"

‎test/functional/test_framework/messages.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ def __repr__(self):
928928
HEADER_DYNAFED_HF_MASK = 0x7fffffff
929929
class CBlockHeader:
930930
__slots__ = ("hash", "hashMerkleRoot", "hashPrevBlock", "nBits", "nNonce",
931-
"nTime", "nVersion", "sha256", "block_height", "proof", "m_dyna_params",
931+
"nTime", "nVersion", "sha256", "block_height", "proof", "m_dynafed_params",
932932
"m_signblock_witness")
933933

934934
def __init__(self, header=None):
@@ -943,7 +943,7 @@ def __init__(self, header=None):
943943
self.proof = header.proof
944944
self.sha256 = header.sha256
945945
self.hash = header.hash
946-
self.m_dyna_params = header.m_dyna_params
946+
self.m_dynafed_params = header.m_dynafed_params
947947
self.m_signblock_witness = header.m_signblock_witness
948948
self.calc_sha256()
949949

@@ -954,7 +954,7 @@ def set_null(self):
954954
self.nTime = 0
955955
self.block_height = 0
956956
self.proof = CProof()
957-
self.m_dyna_params = DynaFedParams()
957+
self.m_dynafed_params = DynaFedParams()
958958
self.m_signblock_witness = CScriptWitness()
959959
self.sha256 = None
960960
self.hash = None
@@ -972,7 +972,7 @@ def deserialize(self, f):
972972
self.nTime = struct.unpack("<I", f.read(4))[0]
973973
self.block_height = struct.unpack("<I", f.read(4))[0]
974974
if is_dyna:
975-
self.m_dyna_params.deserialize(f)
975+
self.m_dynafed_params.deserialize(f)
976976
self.m_signblock_witness.stack = deser_string_vector(f)
977977
else:
978978
self.proof.deserialize(f)
@@ -983,7 +983,7 @@ def serialize(self):
983983
r = b""
984984
nVersion = self.nVersion
985985
is_dyna = False
986-
if not self.m_dyna_params.is_null():
986+
if not self.m_dynafed_params.is_null():
987987
nVersion -= HEADER_HF_BIT
988988
is_dyna = True
989989

@@ -993,7 +993,7 @@ def serialize(self):
993993
r += struct.pack("<I", self.nTime)
994994
r += struct.pack("<I", self.block_height)
995995
if is_dyna:
996-
r += self.m_dyna_params.serialize()
996+
r += self.m_dynafed_params.serialize()
997997
r += ser_string_vector(self.m_signblock_witness.stack)
998998
else:
999999
r += self.proof.serialize()
@@ -1003,7 +1003,7 @@ def calc_sha256(self):
10031003
if self.sha256 is None:
10041004
nVersion = self.nVersion
10051005
is_dyna = False
1006-
if not self.m_dyna_params.is_null():
1006+
if not self.m_dynafed_params.is_null():
10071007
nVersion -= HEADER_HF_BIT
10081008
is_dyna = True
10091009

@@ -1014,7 +1014,7 @@ def calc_sha256(self):
10141014
r += struct.pack("<I", self.nTime)
10151015
r += struct.pack("<I", self.block_height)
10161016
if is_dyna:
1017-
r += self.m_dyna_params.serialize()
1017+
r += self.m_dynafed_params.serialize()
10181018
else:
10191019
r += self.proof.serialize_for_hash()
10201020
self.sha256 = uint256_from_str(hash256(r))
@@ -1101,9 +1101,9 @@ def solve(self):
11011101
# self.rehash()
11021102

11031103
def __repr__(self):
1104-
return "CBlock(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s vtx=%s m_dyna_params=%s)" \
1104+
return "CBlock(nVersion=%i hashPrevBlock=%064x hashMerkleRoot=%064x nTime=%s vtx=%s m_dynafed_params=%s)" \
11051105
% (self.nVersion, self.hashPrevBlock, self.hashMerkleRoot,
1106-
time.ctime(self.nTime), repr(self.vtx), self.m_dyna_params)
1106+
time.ctime(self.nTime), repr(self.vtx), self.m_dynafed_params)
11071107

11081108

11091109
class PrefilledTransaction:

0 commit comments

Comments
 (0)