Merge pull request ElementsProject#8 from kallewoof/fix-coinbase

Fix coinbase to not use bad dest.
AkioNak · Jul 24, 2017 · ddb23a0 · ddb23a0
2 parents 08d0d15 + 800d83d
commit ddb23a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -145,7 +145,7 @@ class CElementsParams : public CChainParams {
         genesis = CreateGenesisBlock(consensus, strNetworkID, scriptDestination, 1231006505, genesisChallengeScript, 1, MAX_MONEY, 100, BITCOINID);
         consensus.hashGenesisBlock = genesis.GetHash();
 
-        scriptCoinbaseDestination = CScript() << ParseHex("0229536c4c83789f59c30b93eb40d4abbd99b8dcc99ba8bd748f29e33c1d279e3c") << OP_CHECKSIG;
+        scriptCoinbaseDestination = CScript() << ParseHex("038cbd59ea89a20f7aeafcf9b907280ef186204e6dd64337284f8471e97c4eefc5") << OP_CHECKSIG;
         vFixedSeeds.clear(); //! TODO
         vSeeds.clear(); //! TODO
 

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -168,7 +168,7 @@ UniValue getnewblockhex(const JSONRPCRequest& request)
             + HelpExampleCli("getnewblockhex", "")
         );
 
-    std::unique_ptr<CBlockTemplate> pblocktemplate(BlockAssembler(Params()).CreateNewBlock(CScript() << OP_TRUE));
+    std::unique_ptr<CBlockTemplate> pblocktemplate(BlockAssembler(Params()).CreateNewBlock(Params().Consensus().CoinbaseDestination());
     if (!pblocktemplate.get())
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Wallet keypool empty");
     {