From 5d81cddcad5b6949c1d358ea60bde667fe111598 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 4 Dec 2020 09:52:41 -0500 Subject: [PATCH] Hush First All The Way --- src/cc/eval.h | 2 +- src/cc/import.cpp | 2 +- src/hush_defs.h | 2 +- src/hush_utils.h | 2 +- src/rpc/crosschain.cpp | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cc/eval.h b/src/cc/eval.h index c3dae192c..cbb9d4967 100644 --- a/src/cc/eval.h +++ b/src/cc/eval.h @@ -27,7 +27,7 @@ #include "consensus/validation.h" #include "primitives/transaction.h" -#define KOMODO_FIRSTFUNGIBLEID 100 +#define HUSH_FIRSTFUNGIBLEID 100 /* * Eval codes diff --git a/src/cc/import.cpp b/src/cc/import.cpp index a3f82a556..57a7b4e34 100644 --- a/src/cc/import.cpp +++ b/src/cc/import.cpp @@ -705,7 +705,7 @@ bool Eval::ImportCoin(const std::vector params, const CTransaction &imp // Check burntx shows correct outputs hash if (payoutsHash != SerializeHash(payouts)) return Invalid("wrong-payouts"); - if (targetCcid < KOMODO_FIRSTFUNGIBLEID) + if (targetCcid < HUSH_FIRSTFUNGIBLEID) return Invalid("chain-not-fungible"); if ( targetCcid != 0xffffffff ) diff --git a/src/hush_defs.h b/src/hush_defs.h index 67ac7132a..f3cda142c 100644 --- a/src/hush_defs.h +++ b/src/hush_defs.h @@ -31,7 +31,7 @@ #define IGUANA_MAXSCRIPTSIZE 10001 #define KOMODO_MAXMEMPOOLTIME 3600 // affects consensus #define CRYPTO777_PUBSECPSTR "020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9" -#define KOMODO_FIRSTFUNGIBLEID 100 +#define HUSH_FIRSTFUNGIBLEID 100 #define KOMODO_SAPLING_ACTIVATION 1544832000 // Dec 15th, 2018 #define KOMODO_SAPLING_DEADLINE 1550188800 // Feb 15th, 2019 #define _COINBASE_MATURITY 100 diff --git a/src/hush_utils.h b/src/hush_utils.h index 4ac5453c0..579d6cc73 100644 --- a/src/hush_utils.h +++ b/src/hush_utils.h @@ -2311,7 +2311,7 @@ fprintf(stderr,"extralen.%d before disable bits\n",extralen); printf("baseid.%d MAX_MONEY.%s %.8f\n",baseid,SMART_CHAIN_SYMBOL,(double)MAX_MONEY/SATOSHIDEN); } - if ( ASSETCHAINS_CC >= KOMODO_FIRSTFUNGIBLEID && MAX_MONEY < 1000000LL*SATOSHIDEN ) + if ( ASSETCHAINS_CC >= HUSH_FIRSTFUNGIBLEID && MAX_MONEY < 1000000LL*SATOSHIDEN ) MAX_MONEY = 1000000LL*SATOSHIDEN; if ( KOMODO_BIT63SET(MAX_MONEY) != 0 ) MAX_MONEY = KOMODO_MAXNVALUE; diff --git a/src/rpc/crosschain.cpp b/src/rpc/crosschain.cpp index a2fc20fc7..48d1a2237 100644 --- a/src/rpc/crosschain.cpp +++ b/src/rpc/crosschain.cpp @@ -192,8 +192,8 @@ UniValue migrate_converttoexport(const UniValue& params, bool fHelp, const CPubK "import transaction.\n" ); - if (ASSETCHAINS_CC < KOMODO_FIRSTFUNGIBLEID) - throw runtime_error("-ac_cc < KOMODO_FIRSTFUNGIBLEID"); + if (ASSETCHAINS_CC < HUSH_FIRSTFUNGIBLEID) + throw runtime_error("-ac_cc < HUSH_FIRSTFUNGIBLEID"); if (SMART_CHAIN_SYMBOL[0] == 0) throw runtime_error("Must be called on assetchain"); @@ -266,8 +266,8 @@ UniValue migrate_createburntransaction(const UniValue& params, bool fHelp, const "the \"migrate_createimporttransaction\" method to get the corresponding import transaction.\n" ); - if (ASSETCHAINS_CC < KOMODO_FIRSTFUNGIBLEID) - throw runtime_error("-ac_cc < KOMODO_FIRSTFUNGIBLEID"); + if (ASSETCHAINS_CC < HUSH_FIRSTFUNGIBLEID) + throw runtime_error("-ac_cc < HUSH_FIRSTFUNGIBLEID"); if (SMART_CHAIN_SYMBOL[0] == 0) throw runtime_error("Must be called on assetchain"); @@ -545,8 +545,8 @@ UniValue migrate_createimporttransaction(const UniValue& params, bool fHelp, con "optional notarytxids are txids of notary operator proofs of burn tx existense (from destination chain).\n" "Do not make subsequent call to migrate_completeimporttransaction if notary txids are set"); - if (ASSETCHAINS_CC < KOMODO_FIRSTFUNGIBLEID) - throw runtime_error("-ac_cc < KOMODO_FIRSTFUNGIBLEID"); + if (ASSETCHAINS_CC < HUSH_FIRSTFUNGIBLEID) + throw runtime_error("-ac_cc < HUSH_FIRSTFUNGIBLEID"); if (SMART_CHAIN_SYMBOL[0] == 0) throw runtime_error("Must be called on assetchain");