Skip to content

Commit c4eb0e0

Browse files
jtimonjtimon
committed
HF: Move block.proof.challenge to Consensus::Params::signblockScript
Since the scriptPubKey for signing blocks never changes, there's no point in repeating it with every block header.
1 parent 37ae000 commit c4eb0e0

10 files changed

Lines changed: 40 additions & 49 deletions

File tree

‎src/chainparams.cpp‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
#include "chainparamsseeds.h"
2121

2222
// Safer for users if they load incorrect parameters via arguments.
23-
static std::vector<unsigned char> CommitToArguments(const Consensus::Params& params, const std::string& networkID, const CScript& signblockscript)
23+
static std::vector<unsigned char> CommitToArguments(const Consensus::Params& params, const std::string& networkID)
2424
{
2525
CSHA256 sha2;
2626
unsigned char commitment[32];
2727
sha2.Write((const unsigned char*)networkID.c_str(), networkID.length());
2828
sha2.Write((const unsigned char*)HexStr(params.fedpegScript).c_str(), HexStr(params.fedpegScript).length());
29-
sha2.Write((const unsigned char*)HexStr(signblockscript).c_str(), HexStr(signblockscript).length());
29+
sha2.Write((const unsigned char*)HexStr(params.signblockScript).c_str(), HexStr(params.signblockScript).length());
3030
sha2.Finalize(commitment);
3131
return std::vector<unsigned char>(commitment, commitment + 32);
3232
}
@@ -43,7 +43,7 @@ static CScript StrHexToScriptWithDefault(std::string strScript, const CScript de
4343
return returnScript;
4444
}
4545

46-
static CBlock CreateGenesisBlock(const Consensus::Params& params, const std::string& networkID, const CScript& genesisOutputScript, uint32_t nTime, const CScript& scriptChallenge, int32_t nVersion, const CAmount& genesisReward, const uint32_t rewardShards, const CAsset& asset)
46+
static CBlock CreateGenesisBlock(const Consensus::Params& params, const std::string& networkID, const CScript& genesisOutputScript, uint32_t nTime, int32_t nVersion, const CAmount& genesisReward, const uint32_t rewardShards, const CAsset& genesisAsset)
4747
{
4848
// Shards must be evenly divisible
4949
assert(MAX_MONEY % rewardShards == 0);
@@ -52,16 +52,16 @@ static CBlock CreateGenesisBlock(const Consensus::Params& params, const std::str
5252
txNew.vin.resize(1);
5353
txNew.vout.resize(rewardShards);
5454
// Any consensus-related values that are command-line set can be added here for anti-footgun
55-
txNew.vin[0].scriptSig = CScript(CommitToArguments(params, networkID, scriptChallenge));
55+
txNew.vin[0].scriptSig = CScript(CommitToArguments(params, networkID));
5656
for (unsigned int i = 0; i < rewardShards; i++) {
5757
txNew.vout[i].nValue = genesisReward/rewardShards;
58-
txNew.vout[i].nAsset = asset;
58+
txNew.vout[i].nAsset = genesisAsset;
5959
txNew.vout[i].scriptPubKey = genesisOutputScript;
6060
}
6161

6262
CBlock genesis;
6363
genesis.nTime = nTime;
64-
genesis.proof = CProof(scriptChallenge, CScript());
64+
genesis.proof = CProof(CScript());
6565
genesis.nVersion = nVersion;
6666
genesis.vtx.push_back(MakeTransactionRef(std::move(txNew)));
6767
genesis.hashPrevBlock.SetNull();
@@ -85,7 +85,7 @@ class CElementsParams : public CChainParams {
8585
CScript defaultSignblockScript;
8686
// Default blocksign script for elements
8787
defaultSignblockScript = CScript() << OP_2 << ParseHex("03206b45265ae687dfdc602b8faa7dd749d7865b0e51f986e12c532229f0c998be") << ParseHex("02cc276552e180061f64dc16e2a02e7f9ecbcc744dea84eddbe991721824df825c") << ParseHex("0204c6be425356d9200a3303d95f2c39078cc9473ca49619da1e0ec233f27516ca") << OP_3 << OP_CHECKMULTISIG;
88-
CScript genesisChallengeScript = StrHexToScriptWithDefault(GetArg("-signblockscript", ""), defaultSignblockScript);
88+
consensus.signblockScript = StrHexToScriptWithDefault(GetArg("-signblockscript", ""), defaultSignblockScript);
8989
CScript defaultFedpegScript;
9090
defaultFedpegScript = CScript() << OP_2 << ParseHex("02d51090b27ca8f1cc04984614bd749d8bab6f2a3681318d3fd0dd43b2a39dd774") << ParseHex("03a75bd7ac458b19f98047c76a6ffa442e592148c5d23a1ec82d379d5d558f4fd8") << ParseHex("034c55bede1bce8e486080f8ebb7a0e8f106b49efb295a8314da0e1b1723738c66") << OP_3 << OP_CHECKMULTISIG;
9191
consensus.fedpegScript = StrHexToScriptWithDefault(GetArg("-fedpegscript", ""), defaultFedpegScript);
@@ -145,13 +145,13 @@ class CElementsParams : public CChainParams {
145145
parentGenesisBlockHash = uint256S("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943");
146146

147147
// Generate pegged Bitcoin asset
148-
std::vector<unsigned char> commit = CommitToArguments(consensus, strNetworkID, genesisChallengeScript);
148+
std::vector<unsigned char> commit = CommitToArguments(consensus, strNetworkID);
149149
uint256 entropy;
150150
GenerateAssetEntropy(entropy, COutPoint(uint256(commit), 0), parentGenesisBlockHash);
151151
CalculateAsset(consensus.pegged_asset, entropy);
152152

153153
CScript scriptDestination(CScript() << std::vector<unsigned char>(parentGenesisBlockHash.begin(), parentGenesisBlockHash.end()) << OP_WITHDRAWPROOFVERIFY);
154-
genesis = CreateGenesisBlock(consensus, strNetworkID, scriptDestination, 1231006505, genesisChallengeScript, 1, MAX_MONEY, 100, consensus.pegged_asset);
154+
genesis = CreateGenesisBlock(consensus, strNetworkID, scriptDestination, 1231006505, 1, MAX_MONEY, 100, consensus.pegged_asset);
155155
consensus.hashGenesisBlock = genesis.GetHash();
156156

157157
scriptCoinbaseDestination = CScript() << ParseHex("0229536c4c83789f59c30b93eb40d4abbd99b8dcc99ba8bd748f29e33c1d279e3c") << OP_CHECKSIG;
@@ -212,7 +212,7 @@ class CRegTestParams : public CChainParams {
212212
public:
213213
CRegTestParams() {
214214
const CScript defaultRegtestScript(CScript() << OP_TRUE);
215-
CScript genesisChallengeScript = StrHexToScriptWithDefault(GetArg("-signblockscript", ""), defaultRegtestScript);
215+
consensus.signblockScript = StrHexToScriptWithDefault(GetArg("-signblockscript", ""), defaultRegtestScript);
216216
consensus.fedpegScript = StrHexToScriptWithDefault(GetArg("-fedpegscript", ""), defaultRegtestScript);
217217

218218
strNetworkID = CHAINPARAMS_REGTEST;
@@ -255,12 +255,12 @@ class CRegTestParams : public CChainParams {
255255
parentGenesisBlockHash = uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206");
256256

257257
// Generate pegged Bitcoin asset
258-
std::vector<unsigned char> commit = CommitToArguments(consensus, strNetworkID, genesisChallengeScript);
258+
std::vector<unsigned char> commit = CommitToArguments(consensus, strNetworkID);
259259
uint256 entropy;
260260
GenerateAssetEntropy(entropy, COutPoint(uint256(commit), 0), parentGenesisBlockHash);
261261
CalculateAsset(consensus.pegged_asset, entropy);
262262

263-
genesis = CreateGenesisBlock(consensus, strNetworkID, defaultRegtestScript, 1296688602, genesisChallengeScript, 1, MAX_MONEY, 100, consensus.pegged_asset);
263+
genesis = CreateGenesisBlock(consensus, strNetworkID, defaultRegtestScript, 1296688602, 1, MAX_MONEY, 100, consensus.pegged_asset);
264264
consensus.hashGenesisBlock = genesis.GetHash();
265265

266266

@@ -321,6 +321,10 @@ class CCustomParams : public CChainParams {
321321
// By default assume that the signatures in ancestors of this block are valid.
322322
consensus.defaultAssumeValid = uint256S(GetArg("-con_defaultassumevalid", "0x00"));
323323

324+
const CScript defaultRegtestScript(CScript() << OP_TRUE);
325+
consensus.signblockScript = StrHexToScriptWithDefault(GetArg("-signblockscript", ""), defaultRegtestScript);
326+
consensus.fedpegScript = StrHexToScriptWithDefault(GetArg("-fedpegscript", ""), defaultRegtestScript);
327+
324328
nDefaultPort = GetArg("-ndefaultport", 18444);
325329
nPruneAfterHeight = GetArg("-npruneafterheight", 1000);
326330
fDefaultConsistencyChecks = GetBoolArg("-fdefaultconsistencychecks", true);

‎src/consensus/params.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ struct Params {
6868
CScript fedpegScript;
6969
CAsset pegged_asset;
7070
uint256 defaultAssumeValid;
71+
CScript signblockScript;
7172
};
7273
} // namespace Consensus
7374

‎src/pow.cpp‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,20 @@
2121
#include "wallet/wallet.h"
2222
#endif
2323

24-
CScript CombineBlockSignatures(const CBlockHeader& header, const CScript& scriptSig1, const CScript& scriptSig2)
24+
CScript CombineBlockSignatures(const Consensus::Params& params, const CBlockHeader& header, const CScript& scriptSig1, const CScript& scriptSig2)
2525
{
2626
SignatureData sig1(scriptSig1);
2727
SignatureData sig2(scriptSig2);
28-
return GenericCombineSignatures(header.proof.challenge, header, sig1, sig2).scriptSig;
28+
return GenericCombineSignatures(params.signblockScript, header, sig1, sig2).scriptSig;
2929
}
3030

3131
bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)
3232
{
33-
return block.proof.challenge == indexLast.proof.challenge;
33+
return true;
3434
}
3535

3636
void ResetChallenge(CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params& params)
3737
{
38-
block.proof.challenge = indexLast.proof.challenge;
3938
}
4039

4140
bool CheckBitcoinProof(uint256 hash, unsigned int nBits)
@@ -61,14 +60,14 @@ bool CheckProof(const CBlockHeader& block, const Consensus::Params& params)
6160
{
6261
if (block.GetHash() == params.hashGenesisBlock)
6362
return true;
64-
return GenericVerifyScript(block.proof.solution, block.proof.challenge, SCRIPT_VERIFY_P2SH, block);
63+
return GenericVerifyScript(block.proof.solution, params.signblockScript, SCRIPT_VERIFY_P2SH, block);
6564
}
6665

67-
bool MaybeGenerateProof(CBlockHeader *pblock, CWallet *pwallet)
66+
bool MaybeGenerateProof(const Consensus::Params& params, CBlockHeader *pblock, CWallet *pwallet)
6867
{
6968
#ifdef ENABLE_WALLET
7069
SignatureData solution(pblock->proof.solution);
71-
bool res = GenericSignScript(*pwallet, *pblock, pblock->proof.challenge, solution);
70+
bool res = GenericSignScript(*pwallet, *pblock, params.signblockScript, solution);
7271
pblock->proof.solution = solution.scriptSig;
7372
return res;
7473
#endif
@@ -85,16 +84,6 @@ double GetChallengeDifficulty(const CBlockIndex* blockindex)
8584
return 1;
8685
}
8786

88-
std::string GetChallengeStr(const CBlockIndex& block)
89-
{
90-
return ScriptToAsmStr(block.proof.challenge);
91-
}
92-
93-
std::string GetChallengeStrHex(const CBlockIndex& block)
94-
{
95-
return ScriptToAsmStr(block.proof.challenge);
96-
}
97-
9887
uint32_t GetNonce(const CBlockHeader& block)
9988
{
10089
return 1;

‎src/pow.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,15 @@ class uint256;
2424
bool CheckBitcoinProof(uint256 hash, unsigned int nBits);
2525
bool CheckProof(const CBlockHeader& block, const Consensus::Params&);
2626
/** Scans nonces looking for a hash with at least some zero bits */
27-
bool MaybeGenerateProof(CBlockHeader* pblock, CWallet* pwallet);
27+
bool MaybeGenerateProof(const Consensus::Params& params, CBlockHeader* pblock, CWallet* pwallet);
2828
void ResetProof(CBlockHeader& block);
2929
bool CheckChallenge(const CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params&);
3030
void ResetChallenge(CBlockHeader& block, const CBlockIndex& indexLast, const Consensus::Params&);
3131

32-
CScript CombineBlockSignatures(const CBlockHeader& header, const CScript& scriptSig1, const CScript& scriptSig2);
32+
CScript CombineBlockSignatures(const Consensus::Params& params, const CBlockHeader& header, const CScript& scriptSig1, const CScript& scriptSig2);
3333

3434
/** Avoid using these functions when possible */
3535
double GetChallengeDifficulty(const CBlockIndex* blockindex);
36-
std::string GetChallengeStr(const CBlockIndex& block);
37-
std::string GetChallengeStrHex(const CBlockIndex& block);
3836
uint32_t GetNonce(const CBlockHeader& block);
3937
void SetNonce(CBlockHeader& block, uint32_t nNonce);
4038

‎src/primitives/block.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
std::string CProof::ToString() const
1515
{
16-
return strprintf("CProof(challenge=%s, solution=%s)",
17-
ScriptToAsmStr(challenge), ScriptToAsmStr(solution));
16+
return strprintf("CProof(solution=%s)",
17+
ScriptToAsmStr(solution));
1818
}
1919

2020
uint256 CBlockHeader::GetHash() const

‎src/primitives/block.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,31 @@
1414
class CProof
1515
{
1616
public:
17-
CScript challenge;
1817
CScript solution;
1918

2019
CProof()
2120
{
2221
SetNull();
2322
}
24-
CProof(CScript challengeIn, CScript solutionIn) : challenge(challengeIn), solution(solutionIn) {}
23+
CProof(CScript solutionIn) : solution(solutionIn) {}
2524

2625
ADD_SERIALIZE_METHODS;
2726

2827
template <typename Stream, typename Operation>
2928
inline void SerializationOp(Stream& s, Operation ser_action)
3029
{
31-
READWRITE(*(CScriptBase*)(&challenge));
3230
if (!(s.GetType() & SER_GETHASH))
3331
READWRITE(*(CScriptBase*)(&solution));
3432
}
3533

3634
void SetNull()
3735
{
38-
challenge.clear();
3936
solution.clear();
4037
}
4138

4239
bool IsNull() const
4340
{
44-
return challenge.empty();
41+
return solution.empty();
4542
}
4643

4744
std::string ToString() const;

‎src/rpc/blockchain.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "coins.h"
1111
#include "consensus/validation.h"
1212
#include "validation.h"
13+
#include "core_io.h"
1314
#include "policy/policy.h"
1415
#include "primitives/transaction.h"
1516
#include "rpc/server.h"
@@ -74,7 +75,6 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex)
7475
result.push_back(Pair("time", (int64_t)blockindex->nTime));
7576
result.push_back(Pair("mediantime", (int64_t)blockindex->GetMedianTimePast()));
7677
result.push_back(Pair("nonce", (uint64_t)GetNonce(blockindex->GetBlockHeader())));
77-
result.push_back(Pair("bits", GetChallengeStr(blockindex->GetBlockHeader())));
7878
result.push_back(Pair("difficulty", GetDifficulty(blockindex)));
7979
result.push_back(Pair("chainwork", blockindex->nChainWork.GetHex()));
8080

@@ -118,7 +118,6 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
118118
result.push_back(Pair("time", block.GetBlockTime()));
119119
result.push_back(Pair("mediantime", (int64_t)blockindex->GetMedianTimePast()));
120120
result.push_back(Pair("nonce", (uint64_t)GetNonce(block)));
121-
result.push_back(Pair("bits", GetChallengeStr(block)));
122121
result.push_back(Pair("difficulty", GetDifficulty(blockindex)));
123122
result.push_back(Pair("chainwork", blockindex->nChainWork.GetHex()));
124123

@@ -1046,6 +1045,8 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
10461045
"\nResult:\n"
10471046
"{\n"
10481047
" \"chain\": \"xxxx\", (string) current network name as defined in BIP70 (main, test, regtest)\n"
1048+
" \"signblockhex\": \"xxxx\", (string) the scriptPubKey for signing blocks as a hex string.\n"
1049+
" \"signblockasm\": \"xxxx\", (string) the scriptPubKey for signing blocks in a format more readable for humans (asm).\n"
10491050
" \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n"
10501051
" \"headers\": xxxxxx, (numeric) the current number of headers we have validated\n"
10511052
" \"bestblockhash\": \"...\", (string) the hash of the currently best block\n"
@@ -1079,10 +1080,13 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
10791080
+ HelpExampleRpc("getblockchaininfo", "")
10801081
);
10811082

1083+
const Consensus::Params& consensusParams = Params().GetConsensus();
10821084
LOCK(cs_main);
10831085

10841086
UniValue obj(UniValue::VOBJ);
10851087
obj.push_back(Pair("chain", Params().NetworkIDString()));
1088+
obj.push_back(Pair("signblockhex", HexStr(consensusParams.signblockScript)));
1089+
obj.push_back(Pair("signblockasm", ScriptToAsmStr(consensusParams.signblockScript)));
10861090
obj.push_back(Pair("blocks", (int)chainActive.Height()));
10871091
obj.push_back(Pair("headers", pindexBestHeader ? pindexBestHeader->nHeight : -1));
10881092
obj.push_back(Pair("bestblockhash", chainActive.Tip()->GetBlockHash().GetHex()));
@@ -1092,7 +1096,6 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
10921096
obj.push_back(Pair("chainwork", chainActive.Tip()->nChainWork.GetHex()));
10931097
obj.push_back(Pair("pruned", fPruneMode));
10941098

1095-
const Consensus::Params& consensusParams = Params().GetConsensus();
10961099
UniValue bip9_softforks(UniValue::VOBJ);
10971100
BIP9SoftForkDescPushBack(bip9_softforks, "csv", consensusParams, Consensus::DEPLOYMENT_CSV);
10981101
BIP9SoftForkDescPushBack(bip9_softforks, "segwit", consensusParams, Consensus::DEPLOYMENT_SEGWIT);

‎src/rpc/mining.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,15 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
215215
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
216216

217217
UniValue result(UniValue::VOBJ);
218+
const Consensus::Params& consensusParams = Params().GetConsensus();
218219
const UniValue& sigs = request.params[1].get_array();
219220
for (unsigned int i = 0; i < sigs.size(); i++) {
220221
const std::string& sig = sigs[i].get_str();
221222
if (!IsHex(sig))
222223
continue;
223224
std::vector<unsigned char> vchScript = ParseHex(sig);
224-
block.proof.solution = CombineBlockSignatures(block, block.proof.solution, CScript(vchScript.begin(), vchScript.end()));
225-
if (CheckProof(block, Params().GetConsensus())) {
225+
block.proof.solution = CombineBlockSignatures(consensusParams, block, block.proof.solution, CScript(vchScript.begin(), vchScript.end()));
226+
if (CheckProof(block, consensusParams)) {
226227
result.push_back(Pair("hex", EncodeHexBlock(block)));
227228
result.push_back(Pair("complete", true));
228229
return result;
@@ -738,7 +739,6 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
738739
result.push_back(Pair("coinbaseaux", aux));
739740
result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0]->vout[0].nValue.GetAmount()));
740741
result.push_back(Pair("longpollid", chainActive.Tip()->GetBlockHash().GetHex() + i64tostr(nTransactionsUpdatedLast)));
741-
result.push_back(Pair("target", GetChallengeStrHex(*pblock)));
742742
result.push_back(Pair("mintime", (int64_t)pindexPrev->GetMedianTimePast()+1));
743743
result.push_back(Pair("mutable", aMutable));
744744
result.push_back(Pair("noncerange", "00000000ffffffff"));
@@ -755,7 +755,6 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
755755
result.push_back(Pair("weightlimit", (int64_t)MAX_BLOCK_WEIGHT));
756756
}
757757
result.push_back(Pair("curtime", pblock->GetBlockTime()));
758-
result.push_back(Pair("bits", GetChallengeStr(*pblock)));
759758
result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight+1)));
760759

761760
if (!pblocktemplate->vchCoinbaseCommitment.empty() && fSupportsSegwit) {

‎src/test/test_bitcoin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
7373
newCoinbase.vout[i].scriptPubKey = scriptPubKey;
7474
const_cast<CBlock&>(Params().GenesisBlock()).vtx[0] = MakeTransactionRef(newCoinbase);
7575
const_cast<CBlock&>(Params().GenesisBlock()).hashMerkleRoot = BlockMerkleRoot(Params().GenesisBlock());
76-
const_cast<CBlock&>(Params().GenesisBlock()).proof = CProof(CScript()<<OP_TRUE, CScript());
76+
const_cast<CBlock&>(Params().GenesisBlock()).proof = CProof(CScript());
7777
const_cast<Consensus::Params&>(Params().GetConsensus()).hashGenesisBlock = Params().GenesisBlock().GetHash();
7878

7979
ClearDatadirCache();

‎src/wallet/rpcwallet.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3369,7 +3369,7 @@ UniValue signblock(const JSONRPCRequest& request)
33693369
}
33703370

33713371
block.proof.solution = CScript();
3372-
MaybeGenerateProof(&block, pwalletMain);
3372+
MaybeGenerateProof(Params().GetConsensus(), &block, pwalletMain);
33733373
return HexStr(block.proof.solution.begin(), block.proof.solution.end());
33743374
}
33753375

0 commit comments

Comments
 (0)