diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 494f8da68..4acce0959 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -12,8 +12,9 @@ HUSHTX=${HUSHTX:-$SRCDIR/hush-tx} [ ! -x $HUSHD ] && echo "$HUSHD not found or not executable." && exit 1 -HUSHVER="v3.6.1" -#HUSHVER=$(./src/hushd --version|head -n2|tail -n1|cut -d' ' -f4|cut -d- -f1) +# use this if hushd is not running +#HUSHVER="v3.6.2" +HUSHVER=$(./src/hushd --version|head -n1|cut -d' ' -f4|cut -d- -f1) # Create a footer file with copyright content. # This gets autodetected fine for hushd if --version-string is not set, diff --git a/doc/man/hush-cli.1 b/doc/man/hush-cli.1 index 53029b0f3..857dbde06 100644 --- a/doc/man/hush-cli.1 +++ b/doc/man/hush-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH HUSH-CLI "1" "January 2021" "hush-cli v3.6.1" "User Commands" +.TH HUSH-CLI "1" "February 2021" "hush-cli v3.6.2" "User Commands" .SH NAME -hush-cli \- manual page for hush-cli v3.6.1 +hush-cli \- manual page for hush-cli v3.6.2 .SH DESCRIPTION -Hush RPC client version v3.6.1\-cf5736569\-dirty +Hush RPC client version v3.6.2\-e2e6e44ca\-dirty .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . diff --git a/doc/man/hush-tx.1 b/doc/man/hush-tx.1 index 178d7eb09..6d4ac2f11 100644 --- a/doc/man/hush-tx.1 +++ b/doc/man/hush-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH HUSH-TX "1" "January 2021" "hush-tx v3.6.1" "User Commands" +.TH HUSH-TX "1" "February 2021" "hush-tx v3.6.2" "User Commands" .SH NAME -hush-tx \- manual page for hush-tx v3.6.1 +hush-tx \- manual page for hush-tx v3.6.2 .SH DESCRIPTION -hush\-tx utility version v3.6.1\-cf5736569\-dirty +hush\-tx utility version v3.6.2\-e2e6e44ca\-dirty .SS "Usage:" .TP hush\-tx [options] [commands] diff --git a/doc/man/hushd.1 b/doc/man/hushd.1 index 2d5e5d2e5..54780a095 100644 --- a/doc/man/hushd.1 +++ b/doc/man/hushd.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.10. -.TH HUSHD "1" "January 2021" "hushd v3.6.1" "User Commands" +.TH HUSHD "1" "February 2021" "hushd v3.6.2" "User Commands" .SH NAME -hushd \- manual page for hushd v3.6.1 +hushd \- manual page for hushd v3.6.2 .SH DESCRIPTION -Hush Daemon version v3.6.1\-cf5736569\-dirty +Hush Daemon version v3.6.2\-e2e6e44ca\-dirty .PP In order to ensure you are adequately protecting your privacy when using Hush, please see . @@ -37,7 +37,7 @@ How thorough the block verification of \fB\-checkblocks\fR is (0\-4, default: 3) .HP \fB\-clientname=\fR .IP -Full node client name, default 'MagicBean' +Full node client name, default 'GoldenSandtrout' .HP \fB\-conf=\fR .IP @@ -143,7 +143,7 @@ Add a node to connect to and attempt to keep the connection open \fB\-asmap=\fR .IP Specify asn mapping used for bucketing of the peers (default: -ip_asn.map). Relative paths will be prefixed by the net\-specific datadir +asmap.dat). Relative paths will be prefixed by the net\-specific datadir location. .HP \fB\-banscore=\fR diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 297c5ddd7..fcd23a576 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -716,10 +716,16 @@ void *chainparams_commandline() { (425000, uint256S("0x000000104d409a2b87617ad6f7638d5000b6ec8aad5f54dee6d6b13e0f7f66b3")) (426000, uint256S("0x0000000bdddcaaa58568a7d5da4380c5735b9d9374e8e393e14303fca51e374f")) (427000, uint256S("0x00000002195dafd6ba01b4089c55e35521fed90bf95420abdb73e9edb0c7e779")) - (428000, uint256S("0x00000002ea968e35749a7f41c52e61b0f4635384020a82282d997594b017d446")), - (int64_t) 1613427108, // time of last checkpointed block - (int64_t) 746450, // total txs - (double) 1326 // txs in the last day before block 428724 + (428000, uint256S("0x00000002ea968e35749a7f41c52e61b0f4635384020a82282d997594b017d446")) + (429000, uint256S("0x00000007e213a5778b3a942016a7d7576c6c141f913342a1f627417c4f334224")) + (430000, uint256S("0x0000000f827d7a004367c15c973814cc47e32287b727ebe3a4cb581703979593")) + (431000, uint256S("0x0000000d709ec810da6a2f55ff5d10bff9a5580ffe4fee8ce27abaf175cb6312")) + (432000, uint256S("0x000000007d91ea56e7e129991aa33e57224d0f898a5a46b02efb81f40aae5ed8")) + (433000, uint256S("0x00000009da7df1aad22c96ed458fa7feae1216811568fb0e9c2f09db25dee3f0")) + (434000, uint256S("0x0000001003f3460d4b0414f94e35025c76f72b8607e0ea00c7790e10172ef8e3")), + (int64_t) 1613879454, // time of last checkpointed block + (int64_t) 752357, // total txs + (double) 1187 // txs in the last day before block 434429 }; } else { checkpointData = //(Checkpoints::CCheckpointData)