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

It is called hush-arrakis-chain now

Browse Source
This commit is contained in:
Duke
2024-03-15 15:14:26 -04:00
parent 49f8cf7ca7
commit d1991e6454
11 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -25,7 +25,7 @@ RUN cd /hush && \
RUN ln -sf /hush/src/hushd /usr/bin/hushd && \ RUN ln -sf /hush/src/hushd /usr/bin/hushd && \
ln -sf /hush/src/hush-tx /usr/bin/hush-tx && \ ln -sf /hush/src/hush-tx /usr/bin/hush-tx && \
ln -sf /hush/src/wallet-utility /usr/bin/hush-wallet-utility && \ ln -sf /hush/src/wallet-utility /usr/bin/hush-wallet-utility && \
ln -sf /hush/src/hush-smart-chain /usr/bin/hush-smart-chain && \ ln -sf /hush/src/hush-arrakis-chain /usr/bin/hush-arrakis-chain && \
ln -sf /hush/util/docker-entrypoint.sh /usr/bin/entrypoint && \ ln -sf /hush/util/docker-entrypoint.sh /usr/bin/entrypoint && \
ln -sf /hush/util/docker-hush-cli.sh /usr/bin/hush-cli ln -sf /hush/util/docker-hush-cli.sh /usr/bin/hush-cli

10
doc/randomx.md
View File

@@ -13,12 +13,12 @@ The following command can be used to launch an HSC on a single computer. Each op
HSC CLI arguments that start with `-ac_` means they *Affect Consensus*. HSC CLI arguments that start with `-ac_` means they *Affect Consensus*.
``` ```
./src/hush-smart-chain -ac_halving=100 -ac_algo=randomx -ac_name=RANDOMX -ac_private=1 -ac_blocktime=15 -ac_reward=500000000 -ac_supply=55555 -gen=1 -genproclimit=1 -testnode=1 ./src/hush-arrakis-chain -ac_halving=100 -ac_algo=randomx -ac_name=RANDOMX -ac_private=1 -ac_blocktime=15 -ac_reward=500000000 -ac_supply=55555 -gen=1 -genproclimit=1 -testnode=1
``` ```
* `hush-smart-chain` is the script used to launch or connect to HSCs * `hush-arrakis-chain` is the script used to launch or connect to HSCs
* It lives in the `./src` directory, next to `hushd` and `hush-cli` * It lives in the `./src` directory, next to `hushd` and `hush-cli`
* It is called `hush-smart-chain.bat` on Windows * It is called `hush-arrakis-chain.bat` on Windows
* `-ac_halving=100` means "the block reward halves every 100 blocks" * `-ac_halving=100` means "the block reward halves every 100 blocks"
* `-ac_algo=randomx` means "use RandomX for Proof-Of-Work * `-ac_algo=randomx` means "use RandomX for Proof-Of-Work
* The default is Equihash (200,9) * The default is Equihash (200,9)
@@ -41,12 +41,12 @@ HSC CLI arguments that start with `-ac_` means they *Affect Consensus*.
* One node would use * One node would use
``` ```
# first node # first node
./src/hush-smart-chain -ac_halving=100 -ac_algo=randomx -ac_name=RANDOMX -ac_private=1 -ac_blocktime=15 -ac_reward=500000000 -ac_supply=55555 ./src/hush-arrakis-chain -ac_halving=100 -ac_algo=randomx -ac_name=RANDOMX -ac_private=1 -ac_blocktime=15 -ac_reward=500000000 -ac_supply=55555
``` ```
* And the second node would use: * And the second node would use:
``` ```
# mining node. NOTE: This node will mine the genesis block and pre-mine, if any # mining node. NOTE: This node will mine the genesis block and pre-mine, if any
./src/hush-smart-chain -ac_halving=100 -ac_algo=randomx -ac_name=RANDOMX -ac_private=1 -ac_blocktime=15 -ac_reward=500000000 -ac_supply=55555 -gen=1 -genproclimit=1 ./src/hush-arrakis-chain -ac_halving=100 -ac_algo=randomx -ac_name=RANDOMX -ac_private=1 -ac_blocktime=15 -ac_reward=500000000 -ac_supply=55555 -gen=1 -genproclimit=1
``` ```
# Advanced Options # Advanced Options

4
qa/rpc-tests/test_framework/test_framework.py
View File

@@ -162,10 +162,10 @@ class ComparisonTestFramework(BitcoinTestFramework):
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--testbinary", dest="testbinary", parser.add_option("--testbinary", dest="testbinary",
default=os.getenv("BITCOIND", "hush-smart-chain"), default=os.getenv("BITCOIND", "hush-arrakis-chain"),
help="bitcoind binary to test") help="bitcoind binary to test")
parser.add_option("--refbinary", dest="refbinary", parser.add_option("--refbinary", dest="refbinary",
default=os.getenv("BITCOIND", "hush-smart-chain"), default=os.getenv("BITCOIND", "hush-arrakis-chain"),
help="bitcoind binary to use for reference nodes (if any)") help="bitcoind binary to use for reference nodes (if any)")
def setup_chain(self): def setup_chain(self):

2
src/cc/dapps/dappinc.h
View File

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

2
src/dragonxd
View File

@@ -13,4 +13,4 @@ cd $DIR
SEEDNODE=176.126.87.241 SEEDNODE=176.126.87.241
# Remember Remember the 5th November for freedom of speech is not free!! # 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 $@

2
src/hush_bitcoind.h
View File

@@ -948,7 +948,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams);
// This function defines the Hush Founders Reward (AKA Dev Tax) // This function defines the Hush Founders Reward (AKA Dev Tax)
// 10% of all block rewards go towards Hush core team // 10% of all block rewards go towards Hush core team
// If you do not like this, you are encouraged to fork the chain // If you do not like this, you are encouraged to fork the chain
// or start your own Hush Arrakis 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. // 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 // 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 // but to tell the AC params, I need to say "11% of 11.25" is 1.25

2
src/smartchains
View File

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

17
src/smartchains.old
View File

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

2
src/testdragonxd
View File

@@ -14,4 +14,4 @@ BLOCKTIME=18
SUPPLY=0 SUPPLY=0
# Remember Remember the 5th November for freedom of speech is not free!! # 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 $@

2
util/build-debian-package.sh
View File

@@ -77,7 +77,7 @@ strip $DEB_BIN/hush-tx
cp $SRC_PATH/src/dragonx-cli $DEB_BIN cp $SRC_PATH/src/dragonx-cli $DEB_BIN
cp $SRC_PATH/src/dragonxd $DEB_BIN cp $SRC_PATH/src/dragonxd $DEB_BIN
cp $SRC_PATH/src/hush-smart-chain $DEB_BIN cp $SRC_PATH/src/hush-arrakis-chain $DEB_BIN
#cp $SRC_DEB/changelog $DEB_DOC/changelog.Debian #cp $SRC_DEB/changelog $DEB_DOC/changelog.Debian
cp $SRC_DEB/copyright $DEB_DOC cp $SRC_DEB/copyright $DEB_DOC
cp -r $SRC_DEB/examples $DEB_DOC cp -r $SRC_DEB/examples $DEB_DOC

2
util/gen-linux-binary-release.sh
View File

@@ -24,7 +24,7 @@ echo "Created new build dir $BUILD"
cp contrib/asmap/asmap.dat $BUILD cp contrib/asmap/asmap.dat $BUILD
cp sapling*.params $BUILD cp sapling*.params $BUILD
cd src cd src
cp hushd hush-cli hush-tx hush-smart-chain dragonx-cli dragonxd ../$BUILD cp hushd hush-cli hush-tx hush-arrakis-chain dragonx-cli dragonxd ../$BUILD
cd ../$BUILD cd ../$BUILD
strip hushd hush-cli hush-tx strip hushd hush-cli hush-tx
cd .. cd ..