Merge branch 'dev' into duke

src/cc/customcc.cpp

@@ -1,88 +1,15 @@
 // Copyright (c) 2016-2024 The Hush developers
 // Distributed under the GPLv3 software license, see the accompanying
 // file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
-/*
- simple stub custom cc
- 
- Just update the functions in this file, then from ~/hush3/src/cc
- 
- ../hush-cli -ac_name=CUSTOM stop
- ./makecustom
- ../hush-smart-chain -ac_name=CUSTOM -ac_cclib=custom -ac_cc=2 ...
- 
- The above will rebuild hushd and get it running again
- */
-
-CScript custom_opret(uint8_t funcid,CPubKey pk)
-{    
-    CScript opret; uint8_t evalcode = EVAL_CUSTOM;
-    opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << pk);
-    return(opret);
-}
-
-uint8_t custom_opretdecode(CPubKey &pk,CScript scriptPubKey)
-{
-    std::vector<uint8_t> vopret; uint8_t e,f;
-    GetOpReturnData(scriptPubKey,vopret);
-    if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> pk) != 0 && e == EVAL_CUSTOM )
-    {
-        return(f);
-    }
-    return(0);
-}
-
-UniValue custom_rawtxresult(UniValue &result,std::string rawtx,int32_t broadcastflag)
-{
-    CTransaction tx;
-    if ( rawtx.size() > 0 )
-    {
-        result.push_back(Pair("hex",rawtx));
-        if ( DecodeHexTx(tx,rawtx) != 0 )
-        {
-            if ( broadcastflag != 0 && myAddtomempool(tx) != 0 )
-                RelayTransaction(tx);
-            result.push_back(Pair("txid",tx.GetHash().ToString()));
-            result.push_back(Pair("result","success"));
-        } else result.push_back(Pair("error","decode hex"));
-    } else result.push_back(Pair("error","couldnt finalize CCtx"));
-    return(result);
-}
 
 UniValue custom_func0(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
 {
     UniValue result(UniValue::VOBJ);
-    result.push_back(Pair("result","success"));
-    result.push_back(Pair("message","just an example of an information returning rpc"));
     return(result);
 }
 
-// send yourself 1 coin to your CC address using normal utxo from your -pubkey
-
 UniValue custom_func1(uint64_t txfee,struct CCcontract_info *cp,cJSON *params)
 {
-    CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); std::string rawtx;
-    UniValue result(UniValue::VOBJ); CPubKey mypk; int64_t amount = COIN; int32_t broadcastflag=0;
-    if ( txfee == 0 )
-        txfee = CUSTOM_TXFEE;
-    mypk = pubkey2pk(Mypubkey());
-    if ( AddNormalinputs2(mtx,COIN+txfee,64) >= COIN+txfee ) // add utxo to mtx
-    {
-        // make op_return payload as normal. 
-        CScript opret = custom_opret('1',mypk);
-        std::vector<std::vector<unsigned char>> vData = std::vector<std::vector<unsigned char>>();
-        if ( makeCCopret(opret, vData) )
-        {
-            // make vout0 with op_return included as payload.
-            mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,mypk,&vData));
-            fprintf(stderr, "vout size2.%li\n", mtx.vout.size());
-            rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,CScript());
-            return(custom_rawtxresult(result,rawtx,broadcastflag));
-        }
-    }
+    UniValue result(UniValue::VOBJ);
     return(result);
 }
-
-bool custom_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx)
-{
-	return false;
-}

src/cc/customcc.h

@@ -1,20 +1,6 @@
 // Copyright (c) 2016-2024 The Hush developers
 // Distributed under the GPLv3 software license, see the accompanying
 // file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
-/*
- to create a custom libcc.so:
- 
- 1. change "func0" and "func1" to method names that fit your custom cc. Of course, you can create more functions by adding another entry to RPC_FUNCS. there is not any practical limit to the number of methods.
- 
- 2. For each method make sure there is a UniValue function declaration and CUSTOM_DISPATCH has an if statement checking for it that calls the custom_func
- 
- 3. write the actual custom_func0, custom_func1 and custom_validate in customcc.cpp
- 
- 4. ./makecustom, which builds cclib.cpp with -DBUILD_CUSTOMCC and puts the libcc.so in ~/hush3/src and rebuilds hushd
- 
- 5. launch your chain with -ac_cclib=customcc -ac_cc=2
- 
- */
  
 std::string MYCCLIBNAME = (char *)"customcc";
 
@@ -27,22 +13,3 @@ std::string MYCCLIBNAME = (char *)"customcc";
     { (char *)MYCCNAME, (char *)"func0", (char *)"<parameter help>", 1, 1, '0', EVAL_CUSTOM }, \
     { (char *)MYCCNAME, (char *)"func1", (char *)"<no args>", 0, 0, '1', EVAL_CUSTOM },
 
-bool custom_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx);
-UniValue custom_func0(uint64_t txfee,struct CCcontract_info *cp,cJSON *params);
-UniValue custom_func1(uint64_t txfee,struct CCcontract_info *cp,cJSON *params);
-
-#define CUSTOM_DISPATCH \
-if ( cp->evalcode == EVAL_CUSTOM ) \
-{ \
-    if ( strcmp(method,"func0") == 0 ) \
-        return(custom_func0(txfee,cp,params)); \
-    else if ( strcmp(method,"func1") == 0 ) \
-        return(custom_func1(txfee,cp,params)); \
-    else \
-    { \
-        result.push_back(Pair("result","error")); \
-        result.push_back(Pair("error","invalid customcc method")); \
-        result.push_back(Pair("method",method)); \
-        return(result); \
-    } \
-}

src/cc/dapps/dappinc.h

@@ -339,7 +339,7 @@ cJSON *get_hushcli(char *refcoin,char **retstrp,char *acname,char *method,char *
     if ( acname[0] != 0 ) {
         if ( refcoin[0] != 0 && strcmp(refcoin,"HUSH3") != 0 && strcmp(refcoin,acname) != 0 )
             printf("unexpected: refcoin.(%s) acname.(%s)\n",refcoin,acname);
-        sprintf(cmdstr,"hush-smart-chain -ac_name=%s %s %s %s %s %s %s %s %s > %s\n",acname,method,arg0,arg1,arg2,arg3,arg4,arg5,arg6,fname);
+        sprintf(cmdstr,"hush-arrakis-chain -ac_name=%s %s %s %s %s %s %s %s %s > %s\n",acname,method,arg0,arg1,arg2,arg3,arg4,arg5,arg6,fname);
     }
     else if ( strcmp(refcoin,"HUSH3") == 0 )
         sprintf(cmdstr,"hush-cli %s %s %s %s %s %s %s %s > %s\n",method,arg0,arg1,arg2,arg3,arg4,arg5,arg6,fname);

src/cc/dapps/zmigrate.c

@@ -23,7 +23,7 @@
 #include "cJSON.c"
 
 /*
-NOTE: HUSH nor any Hush Smart Chain has any sprout outputs. This code is kept for historical and educational purposes.
+NOTE: HUSH nor any Hush Arrakis Chain has any sprout outputs. This code is kept for historical and educational purposes.
 
  z_migrate: the purpose of z_migrate is to make converting of all sprout outputs into sapling. the usage would be for the user to specify a sapling address and call z_migrate zsaddr, until it returns that there is nothing left to be done.
  

src/chainparams.cpp

@@ -117,7 +117,7 @@ public:
         consensus.nPowMaxAdjustDown = 32; // 32% adjustment down
         consensus.nPowMaxAdjustUp   = 16; // 16% adjustment up
         // we are emulating old node behavior at startup, they used 150s
-        consensus.nPowTargetSpacing = 150; // 75; // HUSH is 75 seconds, Hush Smart Chains are 60 seconds by default
+        consensus.nPowTargetSpacing = 150; // 75; // HUSH is 75 seconds, Hush Arrakis Chains are 60 seconds by default
         consensus.nPowAllowMinDifficultyBlocksAfterHeight = boost::none;
         // HUSH never had Sprout in our blockchain history, but some internals require *knowing* about Sprout
         // or it breaks backward compatibility. We do what we can.

src/dragonxd

@@ -13,4 +13,4 @@ cd $DIR
 SEEDNODE=176.126.87.241
 
 # Remember Remember the 5th November for freedom of speech is not free!!
-./hush-smart-chain -ac_name=DRAGONX -ac_algo=randomx -ac_halving=3500000 -ac_reward=300000000 -ac_blocktime=36 -ac_private=1 -addnode=$SEEDNODE $@
+./hush-arrakis-chain -ac_name=DRAGONX -ac_algo=randomx -ac_halving=3500000 -ac_reward=300000000 -ac_blocktime=36 -ac_private=1 -addnode=$SEEDNODE $@

src/hush_bitcoind.h

@@ -948,7 +948,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);
 // This function defines the Hush Founders Reward (AKA Dev Tax)
 // 10% of all block rewards go towards Hush core team
 // If you do not like this, you are encouraged to fork the chain
-// or start your own Hush Smart Chain: https://git.hush.is/hush/hush-smart-chains
+// or start your own Hush Arrakis Chain: https://git.hush.is/hush/hush-arrakis-chains
 // HUSH supply curve cannot be exactly represented via CLI args, so we do it ourselves.
 // You specify the BR, and the FR % gets added so 10% of 12.5 is 1.25
 // but to tell the AC params, I need to say "11% of 11.25" is 1.25

src/hush_utils.h

@@ -1611,7 +1611,7 @@ uint64_t hush_block_subsidy(int height)
     return subsidy;
 }
 
-// wrapper for more general supply curves of Hush Smart Chains
+// wrapper for more general supply curves of Hush Arrakis Chains
 uint64_t hush_sc_block_subsidy(int nHeight)
 {
     // Find current era, start from beginning reward, and determine current subsidy

src/init.cpp

@@ -1128,7 +1128,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             LogPrintf("%s: parameter interaction: -externalip set -> setting -discover=0\n", __func__);
     }
 
-    // Read asmap file by default for HUSH3 and all Hush Smart Chains
+    // Read asmap file by default for HUSH3 and all Hush Arrakis Chains
     if (GetArg("-asmap",1)) {
         fs::path asmap_path = fs::path(GetArg("-asmap", ""));
 

src/miner.cpp

@@ -1128,7 +1128,7 @@ void static RandomXMiner()
     char randomxHash[RANDOMX_HASH_SIZE];
     rxdebug("%s: created randomxHash of size %d\n", RANDOMX_HASH_SIZE);
     char randomxKey[82]; // randomx spec says keysize of >60 bytes is implementation-specific
-    // initial randomx key is unique to every Hush Smart Chain, and has at least 9 bytes (2^9=128 bits) of entropy
+    // initial randomx key is unique to every Hush Arrakis Chain, and has at least 9 bytes (2^9=128 bits) of entropy
     // since magic is 4 bytes, rpc port is 4 bytes and smart chain symbol must be at least 1 character long
     snprintf(randomxKey, 81, "%08x%s%08x", ASSETCHAINS_MAGIC, SMART_CHAIN_SYMBOL, ASSETCHAINS_RPCPORT);
 

src/net.cpp

@@ -2733,7 +2733,7 @@ bool CNode::GetTlsValidate()
 {
     if (tlsValidate == eTlsOption::FALLBACK_UNSET)
     {
-        // This is useful for private Hush Smart Chains, that want to exist
+        // This is useful for private Hush Arrakis Chains, that want to exist
         // on a closed VPN with an internal CA or trusted cert system, or
         // various other use cases
         if ( GetBoolArg("-tlsvalidate", false)) {

src/pow.cpp

@@ -578,7 +578,7 @@ unsigned int CalculateNextWorkRequired(arith_uint256 bnAvg,
     return bnNew.GetCompact();
 }
 
-// HUSH does not use these functions but Hush Smart Chains can opt-in to using more bleeding edge DAA's
+// HUSH does not use these functions but Hush Arrakis Chains can opt-in to using more bleeding edge DAA's
 // ASIC chains do not need these protections as much -- Duke Leto
 unsigned int lwmaGetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
 {

src/rpc/blockchain.cpp

@@ -1620,12 +1620,12 @@ UniValue getchaintxstats(const UniValue& params, bool fHelp, const CPubKey& mypk
             throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid block count: should be between 0 and the block's height - 1");
         }
     }
-    LogPrintf("%s: blockcount = %d\n", __func__, blockcount);
+    // LogPrintf("%s: blockcount = %d\n", __func__, blockcount);
 
     const CBlockIndex* pindexPast = pindex->GetAncestor(pindex->GetHeight() - blockcount);
     int nTimeDiff                 = pindex->GetMedianTimePast() - pindexPast->GetMedianTimePast();
     int nTxDiff                   = pindex->nChainTx - pindexPast->nChainTx;
-    LogPrintf("%s: pindexPast.height = %d, pindex.height = %d\n", __func__, pindexPast->GetHeight(), pindex->GetHeight() );
+    // LogPrintf("%s: pindexPast.height = %d, pindex.height = %d\n", __func__, pindexPast->GetHeight(), pindex->GetHeight() );
 
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("time", (int64_t)pindex->nTime);
@@ -1657,7 +1657,7 @@ UniValue getchaintxstats(const UniValue& params, bool fHelp, const CPubKey& mypk
         ret.pushKV("window_tx_count", nTxDiff);
         ret.pushKV("window_interval", nTimeDiff);
         int64_t nPaymentsDiff              = pindex->nChainPayments - pindexPast->nChainPayments;
-        LogPrintf("%s: pindexPast.nChainPayments = %d, pindex.nChainPayments = %d\n", __func__, pindexPast->nChainPayments, pindex->nChainPayments );
+        //LogPrintf("%s: pindexPast.nChainPayments = %d, pindex.nChainPayments = %d\n", __func__, pindexPast->nChainPayments, pindex->nChainPayments );
         int64_t nShieldedTxDiff            = pindex->nChainShieldedTx - pindexPast->nChainShieldedTx;
         int64_t nShieldingTxDiff           = pindex->nChainShieldingTx - pindexPast->nChainShieldingTx;
         int64_t nDeshieldingTxDiff         = pindex->nChainDeshieldingTx - pindexPast->nChainDeshieldingTx;

src/rpc/misc.cpp

@@ -482,7 +482,7 @@ UniValue validateaddress(const UniValue& params, bool fHelp, const CPubKey& mypk
     if (fHelp || params.size() != 1)
         throw runtime_error(
             "validateaddress \"addr\"\n"
-            "\nReturn information about the given Hush or Hush Smart Chain (HSC) address.\n"
+            "\nReturn information about the given Hush or Hush Arrakis Chain (HAC) address.\n"
             "\nArguments:\n"
             "1. \"addr\"     (string, required) The address to validate\n"
             "\nResult:\n"

src/sc/koolaid

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 # Copyright (c) 2018-2024 The Hush developers
-./hush-smart-chain -ac_name=KOOLAID $@
+./hush-arrakis-chain -ac_name=KOOLAID $@

src/sc/kush

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 # Copyright (c) 2018-2024 The Hush developers
-./hush-smart-chain -ac_name=KUSH $@
+./hush-arrakis-chain -ac_name=KUSH $@

src/sc/zex

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 # Copyright (c) 2018-2024 The Hush developers
-./hush-smart-chain -ac_name=ZEX $@
+./hush-arrakis-chain -ac_name=ZEX $@

src/smartchains

@@ -6,7 +6,7 @@ set -eo pipefail
 source pubkey.txt
 overide_args="$@"
 seed_ip=$(SEEDNODE)
-hsc='./hush-smart-chain'
+hsc='./hush-arrakis-chain'
 
 if [ -z "$delay" ]; then delay=20; fi
 

src/smartchains.old

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2018-2024 The Hush developers
-set -x
-delay=60
-source pubkey.txt
-echo $pubkey
-echo "jl777 is a traitor to his village of cypherpunks, ca333 is his obedient servant"
-
-hsc="./hush-smart-chain"
-ip=$(HUSHDEX_SEEDNODE)
-
-# this chain helps power HushDEX
-$hsc -pubkey=$pubkey -ac_name=ZEX   -ac_supply=100000000 -addnode=$ip $@ &
-
-# these are testcoins, like ARRR
-$hsc -pubkey=$pubkey -ac_name=ZUSH    -ac_supply=100000000 -addnode=$ip $@ &
-$hsc -pubkey=$pubkey -ac_name=KOOLAID -ac_supply=100000000 -addnode=$ip $@ &

src/testdragonxd

@@ -14,4 +14,4 @@ BLOCKTIME=18
 SUPPLY=0
 
 # Remember Remember the 5th November for freedom of speech is not free!!
-./hush-smart-chain -ac_name=TESTDRAGONX -ac_algo=randomx -ac_halving=3500000 -ac_reward=300000000 -ac_blocktime=$BLOCKTIME -ac_private=1 -ac_supply=$SUPPLY -debug=randomx $@
+./hush-arrakis-chain -ac_name=TESTDRAGONX -ac_algo=randomx -ac_halving=3500000 -ac_reward=300000000 -ac_blocktime=$BLOCKTIME -ac_private=1 -ac_supply=$SUPPLY -debug=randomx $@

src/testequihashd

@@ -15,4 +15,4 @@ SUPPLY=0
 
 # same as TESTDRAGONX except equihash and different ac_name
 # and debug=pow which is the equivalent of debug=randomx for equihash mining
-./hush-smart-chain -ac_name=TESTEQUIHASH -ac_halving=3500000 -ac_reward=300000000 -ac_blocktime=$BLOCKTIME -ac_private=1 -ac_supply=$SUPPLY -debug=pow $@
+./hush-arrakis-chain -ac_name=TESTEQUIHASH -ac_halving=3500000 -ac_reward=300000000 -ac_blocktime=$BLOCKTIME -ac_private=1 -ac_supply=$SUPPLY -debug=pow $@

src/wallet/asyncrpcoperation_sendmany.cpp

@@ -363,7 +363,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
 
 
     /**
-     * SCENARIO #0 (All HUSH and Hush Smart Chains)
+     * SCENARIO #0 (All HUSH and Hush Arrakis Chains)
      * Sprout not involved, so we just use the TransactionBuilder and we're done.
      * We added the transparent inputs to the builder earlier.
      */