DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hush First All The Way

Browse Source
This commit is contained in:
Duke Leto
2020-12-04 09:52:41 -05:00
parent 8a5130713d
commit 5d81cddcad
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc/eval.h
View File

@@ -27,7 +27,7 @@
#include "consensus/validation.h"
#include "primitives/transaction.h"
#define KOMODO_FIRSTFUNGIBLEID 100
#define HUSH_FIRSTFUNGIBLEID 100
/*
* Eval codes

2
src/cc/import.cpp
View File

@@ -705,7 +705,7 @@ bool Eval::ImportCoin(const std::vector<uint8_t> 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 )

2
src/hush_defs.h
View File

@@ -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

2
src/hush_utils.h
View File

@@ -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;

12
src/rpc/crosschain.cpp
View File

@@ -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");