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

Miner should stop trying to account for old PAK system

Browse source
This commit is contained in:
Gregory Sanders 2019-05-31 13:21:38 -04:00
parent f277ec52f1
commit 4818e5e2b4
1 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/miner.cpp
View file

@ -115,22 +115,6 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
return nullptr; return nullptr;
pblock = &pblocktemplate->block; // pointer for convenience pblock = &pblocktemplate->block; // pointer for convenience
std::vector<CScript> commitments;
// ELEMENTS: PAK
// Create block pak commitment if set in conf file and validating pegouts
if (Params().GetEnforcePak() && g_paklist_config) {
if (*g_paklist_config != g_paklist_blockchain) {
g_paklist_config->CreateCommitments(commitments);
}
}
// Pad block weight to account for OP_RETURN commitments with two compressed pubkeys
for (const auto& commitment : commitments) {
CTxOut output(CAsset(), 0, commitment);
nBlockWeight += ::GetSerializeSize(output, PROTOCOL_VERSION)*WITNESS_SCALE_FACTOR;
}
// END PAK
// Add dummy coinbase tx as first transaction // Add dummy coinbase tx as first transaction
pblock->vtx.emplace_back(); pblock->vtx.emplace_back();
@ -211,12 +195,6 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
} }
} }
coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0; coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0;
// ELEMENTS: PAK
// Add PAK transition commitments
for (unsigned int i = 0; i < commitments.size(); i++) {
coinbaseTx.vout.push_back(CTxOut(CAsset(), 0, commitments[i]));
}
// END PAK
pblock->vtx[0] = MakeTransactionRef(std::move(coinbaseTx)); pblock->vtx[0] = MakeTransactionRef(std::move(coinbaseTx));
pblocktemplate->vchCoinbaseCommitment = GenerateCoinbaseCommitment(*pblock, pindexPrev, chainparams.GetConsensus()); pblocktemplate->vchCoinbaseCommitment = GenerateCoinbaseCommitment(*pblock, pindexPrev, chainparams.GetConsensus());
pblocktemplate->vTxFees[0] = -nFees; pblocktemplate->vTxFees[0] = -nFees;