Merge #238: Replace static BITCOINID with asset-derivation style generation

b76b0b2 Change network settings commitment to sha2, include in asset type def (Gregory Sanders)
8c1ba39 Replace static BITCOINID with generated pegged_asset using standard issuance derivation (Gregory Sanders)
ae1f058 Only use chainparams to access BITCOINID as pegged_asset (Gregory Sanders)
000ab24 Add pegged_asset field to consensus params (Gregory Sanders)

Author: instagibbs

contrib/assets_tutorial/assets_tutorial.py

@@ -211,7 +211,7 @@ def sync_all(e1, e2):
 # You can also filter calls using specific asset hex or labels:
 e1.getwalletinfo("bitcoin")
 # bitcoin's hex asset type
-e1.getwalletinfo("09f663de96be771f50cab5ded00256ffe63773e2eaa9a604092951cc3d7c6621")
+e1.getwalletinfo("b2e15d0d7a0c94e4e2ce0fe6e8691b9e451377f6e46e8045a86f7c4b5d4f0f23")
 
 # We can also issue our own assets, 1 asset and 1 reissuance token in this case
 issue = e1.issueasset(1, 1)

contrib/assets_tutorial/assets_tutorial.sh

@@ -144,7 +144,7 @@ e1-cli dumpassetlabels
 # You can also filter calls using specific asset hex or labels:
 e1-cli getwalletinfo bitcoin
 # bitcoin's hex asset type
-e1-cli getwalletinfo 09f663de96be771f50cab5ded00256ffe63773e2eaa9a604092951cc3d7c6621
+e1-cli getwalletinfo b2e15d0d7a0c94e4e2ce0fe6e8691b9e451377f6e46e8045a86f7c4b5d4f0f23
 
 # We can also issue our own assets, 1 asset and 1 reissuance token in this case
 ISSUE=$(e1-cli issueasset 1 1)

src/amount.h

@@ -69,9 +69,6 @@ struct CAsset {
     }
 };
 
-/** The sha256 of Bitcoin genesis block, for easy reference **/
-static const CAsset BITCOINID(uint256S("09f663de96be771f50cab5ded00256ffe63773e2eaa9a604092951cc3d7c6621"));
-
 /** Used for consensus fee and general wallet accounting*/
 typedef std::map<CAsset, CAmount> CAmountMap;
 

src/assetsdir.cpp

@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "assetsdir.h"
+#include "chainparams.h"
 
 #include "tinyformat.h"
 #include "utilstrencodings.h"
@@ -47,7 +48,7 @@ void CAssetsDir::InitFromStrings(const std::vector<std::string>& assetsToInit)
         SetHex(vAssets[0], vAssets[1]);
     }
     // Set "bitcoin" to the pegged asset for tests
-    Set(BITCOINID, AssetMetadata("bitcoin"));
+    Set(Params().GetConsensus().pegged_asset, AssetMetadata("bitcoin"));
 }
 
 CAsset CAssetsDir::GetAsset(const std::string& label) const

src/bench/coin_selection.cpp

@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "bench.h"
+#include "chainparams.h"
 #include "wallet/wallet.h"
 
 #include <boost/foreach.hpp>
@@ -51,10 +52,10 @@ static void CoinSelection(benchmark::State& state)
         std::set<std::pair<const CWalletTx*, unsigned int> > setCoinsRet;
         CAmountMap nValueRet;
         CAmountMap mapValue;
-        mapValue[BITCOINID] = 1003 * COIN;
+        mapValue[Params().GetConsensus().pegged_asset] = 1003 * COIN;
         bool success = wallet.SelectCoinsMinConf(mapValue, 1, 6, 0, vCoins, setCoinsRet, nValueRet);
         assert(success);
-        assert(nValueRet[BITCOINID] == 1003 * COIN);
+        assert(nValueRet[Params().GetConsensus().pegged_asset] == 1003 * COIN);
         assert(setCoinsRet.size() == 2);
     }
 }

src/bitcoin-tx.cpp

@@ -321,7 +321,7 @@ static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& str
     }
 
     // construct TxOut, append to transaction output list
-    CTxOut txout(BITCOINID, value, scriptPubKey);
+    CTxOut txout(Params().GetConsensus().pegged_asset, value, scriptPubKey);
     tx.vout.push_back(txout);
 }
 
@@ -388,7 +388,7 @@ static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& s
     }
 
     // construct TxOut, append to transaction output list
-    CTxOut txout(BITCOINID, value, scriptPubKey);
+    CTxOut txout(Params().GetConsensus().pegged_asset, value, scriptPubKey);
     tx.vout.push_back(txout);
 }
 
@@ -415,7 +415,7 @@ static void MutateTxAddOutData(CMutableTransaction& tx, const std::string& strIn
 
     std::vector<unsigned char> data = ParseHex(strData);
 
-    CTxOut txout(BITCOINID, value, CScript() << OP_RETURN << data);
+    CTxOut txout(Params().GetConsensus().pegged_asset, value, CScript() << OP_RETURN << data);
     tx.vout.push_back(txout);
 }
 

src/chainparams.cpp

@@ -5,12 +5,13 @@
 
 #include "chainparams.h"
 #include "consensus/merkle.h"
+#include "issuance.h"
 
 #include "tinyformat.h"
 #include "util.h"
 #include "utilstrencodings.h"
 #include "amount.h"
-#include "crypto/ripemd160.h"
+#include "crypto/sha256.h"
 
 #include <assert.h>
 
@@ -21,13 +22,13 @@
 // Safer for users if they load incorrect parameters via arguments.
 static std::vector<unsigned char> CommitToArguments(const Consensus::Params& params, const std::string& networkID, const CScript& signblockscript)
 {
-    CRIPEMD160 ripemd;
-    unsigned char commitment[20];
-    ripemd.Write((const unsigned char*)networkID.c_str(), networkID.length());
-    ripemd.Write((const unsigned char*)HexStr(params.fedpegScript).c_str(), HexStr(params.fedpegScript).length());
-    ripemd.Write((const unsigned char*)HexStr(signblockscript).c_str(), HexStr(signblockscript).length());
-    ripemd.Finalize(commitment);
-    return std::vector<unsigned char>(commitment, commitment + 20);
+    CSHA256 sha2;
+    unsigned char commitment[32];
+    sha2.Write((const unsigned char*)networkID.c_str(), networkID.length());
+    sha2.Write((const unsigned char*)HexStr(params.fedpegScript).c_str(), HexStr(params.fedpegScript).length());
+    sha2.Write((const unsigned char*)HexStr(signblockscript).c_str(), HexStr(signblockscript).length());
+    sha2.Finalize(commitment);
+    return std::vector<unsigned char>(commitment, commitment + 32);
 }
 
 static CScript StrHexToScriptWithDefault(std::string strScript, const CScript defaultScript)
@@ -49,9 +50,9 @@ static CBlock CreateGenesisBlock(const Consensus::Params& params, const std::str
     CMutableTransaction txNew;
     txNew.nVersion = 1;
     txNew.vin.resize(1);
+    txNew.vout.resize(rewardShards);
     // Any consensus-related values that are command-line set can be added here for anti-footgun
     txNew.vin[0].scriptSig = CScript(CommitToArguments(params, networkID, scriptChallenge));
-    txNew.vout.resize(rewardShards);
     for (unsigned int i = 0; i < rewardShards; i++) {
         txNew.vout[i].nValue = genesisReward/rewardShards;
         txNew.vout[i].nAsset = asset;
@@ -96,6 +97,7 @@ class CElementsParams : public CChainParams {
         consensus.BIP65Height = 388381; // 000000000000000004c2b624ed5d7756c508d90fd0da2c7c679febfa6c4735f0
         consensus.BIP66Height = 363725; // 00000000000000000379eaa19dce8c9b722d46ae6a57c2f1a988119488b50931
         consensus.powLimit = uint256S("00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+
         // Peg-ins Bitcoin headers must have higher difficulty target than this field
         // This value must be sufficiently small to not preclude realistic parent
         // chain difficulty during network lifespan yet sufficiently large to
@@ -141,8 +143,15 @@ class CElementsParams : public CChainParams {
         nPruneAfterHeight = 100000;
 
         parentGenesisBlockHash = uint256S("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943");
+
+        // Generate pegged Bitcoin asset
+        std::vector<unsigned char> commit = CommitToArguments(consensus, strNetworkID, genesisChallengeScript);
+        uint256 entropy;
+        GenerateAssetEntropy(entropy, COutPoint(uint256(commit), 0), parentGenesisBlockHash);
+        CalculateAsset(consensus.pegged_asset, entropy);
+
         CScript scriptDestination(CScript() << std::vector<unsigned char>(parentGenesisBlockHash.begin(), parentGenesisBlockHash.end()) << OP_WITHDRAWPROOFVERIFY);
-        genesis = CreateGenesisBlock(consensus, strNetworkID, scriptDestination, 1231006505, genesisChallengeScript, 1, MAX_MONEY, 100, BITCOINID);
+        genesis = CreateGenesisBlock(consensus, strNetworkID, scriptDestination, 1231006505, genesisChallengeScript, 1, MAX_MONEY, 100, consensus.pegged_asset);
         consensus.hashGenesisBlock = genesis.GetHash();
 
         scriptCoinbaseDestination = CScript() << ParseHex("0229536c4c83789f59c30b93eb40d4abbd99b8dcc99ba8bd748f29e33c1d279e3c") << OP_CHECKSIG;
@@ -243,10 +252,17 @@ class CRegTestParams : public CChainParams {
         nDefaultPort = 7042;
         nPruneAfterHeight = 1000;
 
-        genesis = CreateGenesisBlock(consensus, strNetworkID, defaultRegtestScript, 1296688602, genesisChallengeScript, 1, MAX_MONEY, 100, BITCOINID);
+        parentGenesisBlockHash = uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206");
+
+        // Generate pegged Bitcoin asset
+        std::vector<unsigned char> commit = CommitToArguments(consensus, strNetworkID, genesisChallengeScript);
+        uint256 entropy;
+        GenerateAssetEntropy(entropy,  COutPoint(uint256(commit), 0), parentGenesisBlockHash);
+        CalculateAsset(consensus.pegged_asset, entropy);
+
+        genesis = CreateGenesisBlock(consensus, strNetworkID, defaultRegtestScript, 1296688602, genesisChallengeScript, 1, MAX_MONEY, 100, consensus.pegged_asset);
         consensus.hashGenesisBlock = genesis.GetHash();
 
-        parentGenesisBlockHash = uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206");
 
         scriptCoinbaseDestination = CScript(); // Allow any coinbase destination
 

src/consensus/params.h

@@ -8,6 +8,7 @@
 
 #include "script/script.h"
 #include "uint256.h"
+#include "amount.h"
 #include <map>
 #include <string>
 
@@ -65,6 +66,7 @@ struct Params {
     int64_t DifficultyAdjustmentInterval() const { return nPowTargetTimespan / nPowTargetSpacing; }
     uint256 nMinimumChainWork;
     CScript fedpegScript;
+    CAsset pegged_asset;
     uint256 defaultAssumeValid;
 };
 } // namespace Consensus

src/init.cpp

@@ -460,7 +460,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-maxsigcachesize=<n>", strprintf("Limit size of signature cache to <n> MiB (default: %u)", DEFAULT_MAX_SIG_CACHE_SIZE));
         strUsage += HelpMessageOpt("-maxtipage=<n>", strprintf("Maximum tip age in seconds to consider node in initial block download (default: %u)", DEFAULT_MAX_TIP_AGE));
     }
-    strUsage += HelpMessageOpt("-feeasset=<hex>", strprintf(_("Asset ID (hex) for mempool/relay fees (default: %s)"), DEFAULT_FEE_ASSET));
+    strUsage += HelpMessageOpt("-feeasset=<hex>", strprintf(_("Asset ID (hex) for mempool/relay fees (default: %s)"), defaultChainParams->GetConsensus().pegged_asset.GetHex()));
     strUsage += HelpMessageOpt("-minrelaytxfee=<amt>", strprintf(_("Fees (in %s/kB) smaller than this are considered zero fee for relaying, mining and transaction creation (default: %s)"),
         CURRENCY_UNIT, FormatMoney(DEFAULT_MIN_RELAY_TX_FEE)));
     strUsage += HelpMessageOpt("-maxtxfee=<amt>", strprintf(_("Maximum total fees (in %s) to use in a single wallet transaction or raw transaction; setting this too low may abort large transactions (default: %s)"),
@@ -1011,7 +1011,7 @@ bool AppInitParameterInteraction()
     if (nConnectTimeout <= 0)
         nConnectTimeout = DEFAULT_CONNECT_TIMEOUT;
 
-    policyAsset = CAsset(uint256S(GetArg("-feeasset", DEFAULT_FEE_ASSET)));
+    policyAsset = CAsset(uint256S(GetArg("-feeasset", chainparams.GetConsensus().pegged_asset.GetHex())));
 
     // Fee-per-kilobyte amount considered the same as "free"
     // If you are mining, be careful setting this:

src/policy/policy.h

@@ -17,7 +17,6 @@ class CCoinsViewCache;
 /** The sha256 of Bitcoin genesis block, for easy reference **/
 extern CAsset policyAsset;
 
-static const std::string DEFAULT_FEE_ASSET = "09f663de96be771f50cab5ded00256ffe63773e2eaa9a604092951cc3d7c6621";
 /** Default for -blockmaxsize, which controls the maximum size of block the mining code will create **/
 static const unsigned int DEFAULT_BLOCK_MAX_SIZE = 1000000;
 /** Default for -blockprioritysize, maximum space for zero/low-fee transactions **/