Skip to content

Commit

Permalink
s/d_params/dynafed_params/
Browse files Browse the repository at this point in the history
  • Loading branch information
@instagibbs
instagibbs committed Sep 5, 2019
1 parent 1779956 commit 0fd39ed
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 28 deletions.
10 changes: 5 additions & 5 deletions src/block_proof.cpp
View file
Expand Up @@ -47,11 +47,11 @@ 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& d_params = block.m_dyna_params;
if (d_params.IsNull()) {
const DynaFedParams& dynafed_params = block.m_dyna_params;
if (dynafed_params.IsNull()) {
return CheckProofGeneric(block, params.max_block_signature_size, params.signblockscript, block.proof.solution, CScriptWitness());
} else {
return CheckProofGeneric(block, d_params.m_current.m_sbs_wit_limit, d_params.m_current.m_signblockscript, CScript(), block.m_signblock_witness);
return CheckProofGeneric(block, dynafed_params.m_current.m_sbs_wit_limit, dynafed_params.m_current.m_signblockscript, CScript(), block.m_signblock_witness);
}
} else {
return CheckProofOfWork(block.GetHash(), block.nBits, params);
Expand All @@ -60,8 +60,8 @@ bool CheckProof(const CBlockHeader& block, const Consensus::Params& params)

bool CheckProofSignedParent(const CBlockHeader& block, const Consensus::Params& params)
{
const DynaFedParams& d_params = block.m_dyna_params;
if (d_params.IsNull()) {
const DynaFedParams& dynafed_params = block.m_dyna_params;
if (dynafed_params.IsNull()) {
return CheckProofGeneric(block, params.max_block_signature_size, params.parent_chain_signblockscript, block.proof.solution, CScriptWitness());
} else {
// Dynamic federations means we cannot validate the signer set
Expand Down
14 changes: 7 additions & 7 deletions src/chain.h
View file
Expand Up @@ -222,7 +222,7 @@ class CBlockIndex
uint32_t nNonce;
CProof proof;
// Dynamic federation fields
DynaFedParams d_params;
DynaFedParams dynafed_params;
CScriptWitness m_signblock_witness;

//! (memory only) Sequential id assigned to distinguish order in which blocks are received.
Expand Down Expand Up @@ -253,7 +253,7 @@ class CBlockIndex
nBits = 0;
nNonce = 0;
proof.SetNull();
d_params.SetNull();
dynafed_params.SetNull();
m_signblock_witness.SetNull();
}

Expand All @@ -272,7 +272,7 @@ class CBlockIndex
nBits = block.nBits;
nNonce = block.nNonce;
proof = block.proof;
d_params = block.m_dyna_params;
dynafed_params = block.m_dyna_params;
m_signblock_witness = block.m_signblock_witness;
}

Expand Down Expand Up @@ -308,7 +308,7 @@ class CBlockIndex
block.nBits = nBits;
block.nNonce = nNonce;
block.proof = proof;
block.m_dyna_params = d_params;
block.m_dyna_params = dynafed_params;
block.m_signblock_witness = m_signblock_witness;
return block;
}
Expand Down Expand Up @@ -443,7 +443,7 @@ class CDiskBlockIndex : public CBlockIndex
this->nVersion = ~CBlockHeader::HF_MASK & nVersion;
} else {
nVersion = this->nVersion;
if (!d_params.IsNull()) {
if (!dynafed_params.IsNull()) {
nVersion |= CBlockHeader::HF_MASK;
is_dyna = true;
}
Expand All @@ -456,7 +456,7 @@ class CDiskBlockIndex : public CBlockIndex
// For compatibility with elements 0.14 based chains
if (g_signed_blocks) {
if (is_dyna) {
READWRITE(d_params);
READWRITE(dynafed_params);
READWRITE(m_signblock_witness.stack);
} else {
READWRITE(proof);
Expand All @@ -480,7 +480,7 @@ class CDiskBlockIndex : public CBlockIndex
block.nBits = nBits;
block.nNonce = nNonce;
block.proof = proof;
block.m_dyna_params = d_params;
block.m_dyna_params = dynafed_params;
return block.GetHash();
}

Expand Down
6 changes: 3 additions & 3 deletions src/dynafed.cpp
View file
Expand Up @@ -15,7 +15,7 @@ bool NextBlockIsParameterTransition(const CBlockIndex* pindexPrev, const Consens
for (int32_t height = next_height - 1; height >= (int32_t)(next_height - consensus.dynamic_epoch_length); --height) {
const CBlockIndex* p_epoch_walk = pindexPrev->GetAncestor(height);
assert(p_epoch_walk);
const ConsensusParamEntry& proposal = p_epoch_walk->d_params.m_proposed;
const ConsensusParamEntry& proposal = p_epoch_walk->dynafed_params.m_proposed;
const uint256 proposal_root = proposal.CalculateRoot();
vote_tally[proposal_root]++;
// Short-circuit once 4/5 threshhold is reached
Expand Down Expand Up @@ -62,15 +62,15 @@ ConsensusParamEntry ComputeNextBlockFullCurrentParameters(const CBlockIndex* pin
// may be pre-dynafed params
const CBlockIndex* p_epoch_start = pindexPrev->GetAncestor(epoch_start_height);
assert(p_epoch_start);
if (p_epoch_start->d_params.IsNull()) {
if (p_epoch_start->dynafed_params.IsNull()) {
// We need to construct the "full" current parameters of pre-dynafed
// consensus

// Convert signblockscript to P2WSH
CScript p2wsh_signblock_script = GetScriptForDestination(WitnessV0ScriptHash(p_epoch_start->proof.challenge));
winning_proposal = ConsensusParamEntry(p2wsh_signblock_script, consensus.max_block_signature_size+consensus.signblockscript.size(), consensus.fedpegScript, consensus.first_extension_space);
} else {
winning_proposal = p_epoch_start->d_params.m_current;
winning_proposal = p_epoch_start->dynafed_params.m_current;
}
return winning_proposal;
}
Expand Down
8 changes: 4 additions & 4 deletions src/pegins.cpp
View file
Expand Up @@ -468,16 +468,16 @@ std::vector<CScript> GetValidFedpegScripts(const CBlockIndex* pblockindex, const
const CBlockIndex* p_prev_epoch_start = pblockindex->GetAncestor(epoch_start_height-epoch_length);

if (p_current_epoch_start) {
if (!p_current_epoch_start->d_params.IsNull()) {
fedpegscripts.push_back(p_current_epoch_start->d_params.m_current.m_fedpegscript);
if (!p_current_epoch_start->dynafed_params.IsNull()) {
fedpegscripts.push_back(p_current_epoch_start->dynafed_params.m_current.m_fedpegscript);
} else {
fedpegscripts.push_back(params.fedpegScript);
}
}

if (p_prev_epoch_start) {
if (!p_prev_epoch_start->d_params.IsNull()) {
fedpegscripts.push_back(p_prev_epoch_start->d_params.m_current.m_fedpegscript);
if (!p_prev_epoch_start->dynafed_params.IsNull()) {
fedpegscripts.push_back(p_prev_epoch_start->dynafed_params.m_current.m_fedpegscript);
} else {
fedpegscripts.push_back(params.fedpegScript);
}
Expand Down
10 changes: 5 additions & 5 deletions src/rpc/blockchain.cpp
View file
Expand Up @@ -95,12 +95,12 @@ UniValue paramEntryToJSON(const ConsensusParamEntry& entry)
return result;
}

UniValue dynaParamsToJSON(const DynaFedParams& d_params)
UniValue dynaParamsToJSON(const DynaFedParams& dynafed_params)
{
AssertLockHeld(cs_main);
UniValue ret(UniValue::VOBJ);
ret.pushKV("current", paramEntryToJSON(d_params.m_current));
ret.pushKV("proposed", paramEntryToJSON(d_params.m_proposed));
ret.pushKV("current", paramEntryToJSON(dynafed_params.m_current));
ret.pushKV("proposed", paramEntryToJSON(dynafed_params.m_proposed));
return ret;
}

Expand Down Expand Up @@ -135,8 +135,8 @@ UniValue blockheaderToJSON(const CBlockIndex* tip, const CBlockIndex* blockindex
} else {
result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution));
result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution));
if (!blockindex->d_params.IsNull()) {
result.pushKV("dynamic_parameters", dynaParamsToJSON(blockindex->d_params));
if (!blockindex->dynafed_params.IsNull()) {
result.pushKV("dynamic_parameters", dynaParamsToJSON(blockindex->dynafed_params));
}
}
result.pushKV("nTx", (uint64_t)blockindex->nTx);
Expand Down
2 changes: 1 addition & 1 deletion src/txdb.cpp
View file
Expand Up @@ -318,7 +318,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts(const Consensus::Params& consensusParams,
pindexNew->proof = diskindex.proof;
pindexNew->nStatus = diskindex.nStatus;
pindexNew->nTx = diskindex.nTx;
pindexNew->d_params = diskindex.d_params;
pindexNew->dynafed_params = diskindex.dynafed_params;
pindexNew->m_signblock_witness = diskindex.m_signblock_witness;

const uint256 block_hash = pindexNew->GetBlockHash();
Expand Down
6 changes: 3 additions & 3 deletions src/validation.cpp
View file
Expand Up @@ -3472,10 +3472,10 @@ static bool ContextualCheckDynaFedHeader(const CBlockHeader& block, CValidationS
return true;
}

const DynaFedParams& d_params = block.m_dyna_params;
const DynaFedParams& dynafed_params = block.m_dyna_params;

// Dynamic blocks must at least publish current signblockscript in full
if (d_params.m_current.IsNull()) {
if (dynafed_params.m_current.IsNull()) {
return state.Invalid(false, REJECT_INVALID, "invalid-dyna-fed", "dynamic block headers must have non-empty current signblockscript field");
}

Expand All @@ -3487,7 +3487,7 @@ static bool ContextualCheckDynaFedHeader(const CBlockHeader& block, CValidationS

const ConsensusParamEntry expected_current_params = ComputeNextBlockCurrentParameters(pindexPrev, params.GetConsensus());

if (expected_current_params != d_params.m_current) {
if (expected_current_params != dynafed_params.m_current) {
return state.Invalid(false, REJECT_INVALID, "invalid-dyna-fed", "dynamic block header's current parameters do not match expected");
}

Expand Down

0 comments on commit 0fd39ed

Please sign in to comment.