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

hush.is is replacing myhush.org

Browse Source
This commit is contained in:
Duke Leto
2020-11-14 17:52:04 -05:00
parent 3bc379ff45
commit a535b349b0
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/debian/control
View File

@@ -2,13 +2,13 @@ Source: hush
Section: utils Section: utils
Priority: optional Priority: optional
Maintainer: Hush <myhushteam@gmail.com> Maintainer: Hush <myhushteam@gmail.com>
Homepage: https://myhush.org Homepage: https://hush.is
Build-Depends: autoconf, automake, bsdmainutils, build-essential, Build-Depends: autoconf, automake, bsdmainutils, build-essential,
git, g++-multilib, libc6-dev, libtool, git, g++-multilib, libc6-dev, libtool,
m4, ncurses-dev, pkg-config, python, m4, ncurses-dev, pkg-config, python,
unzip, wget, zlib1g-dev unzip, wget, zlib1g-dev
Vcs-Git: https://github.com/MyHush/hush3.git Vcs-Git: https://git.hush.is/hush/hush3.git
Vcs-Browser: https://github.com/MyHush/hush3 Vcs-Browser: https://git.hush.is/hush/hush3
Package: hush Package: hush
Architecture: amd64 Architecture: amd64

5
src/chainparams.cpp
View File

@@ -182,9 +182,8 @@ public:
assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b")); assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
vFixedSeeds.clear(); vFixedSeeds.clear();
vSeeds.clear(); vSeeds.clear();
vSeeds.push_back(CDNSSeedData("node1", "dnsseed.myhush.org")); vSeeds.push_back(CDNSSeedData("node1", "dnsseed.hush.is"));
vSeeds.push_back(CDNSSeedData("node2", "dnsseed2.myhush.org")); vSeeds.push_back(CDNSSeedData("node2", "dnsseed2.hush.is"));
vSeeds.push_back(CDNSSeedData("node3", "dnsseed.bleuzero.com"));
// TODO: set up bootstrapping for mainnet // TODO: set up bootstrapping for mainnet
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,60); base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,60);
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,85); base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,85);

2
src/komodo_bitcoind.h
View File

@@ -1236,7 +1236,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 Smart Chain: https://github.com/myhush/hush-smart-chains // or start your own Hush Smart Chain: https://git.hush.is/hush/hush-smart-chains
// HUSH supply curve cannot be exactly represented via KMD AC CLI args, so we do it ourselves. // HUSH supply curve cannot be exactly represented via KMD AC 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

4
src/util.cpp
View File

@@ -980,7 +980,7 @@ std::string PrivacyInfo()
{ {
return "\n" + return "\n" +
FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Hush, please see <%s>."), FormatParagraph(strprintf(_("In order to ensure you are adequately protecting your privacy when using Hush, please see <%s>."),
"https://myhush.org/security/")) + "\n"; "https://hush.is/security/")) + "\n";
} }
std::string LicenseInfo() std::string LicenseInfo()
@@ -991,7 +991,7 @@ std::string LicenseInfo()
FormatParagraph(strprintf(_("Copyright (C) 2015-%i jl777 and SuperNET developers"), COPYRIGHT_YEAR)) + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2015-%i jl777 and SuperNET developers"), COPYRIGHT_YEAR)) + "\n" +
FormatParagraph(strprintf(_("Copyright (C) 2018-%i Duke Leto and The Hush developers"), COPYRIGHT_YEAR)) + "\n" + FormatParagraph(strprintf(_("Copyright (C) 2018-%i Duke Leto and The Hush developers"), COPYRIGHT_YEAR)) + "\n" +
"\n" + "\n" +
FormatParagraph(_("This is experimental software!!!")) + "\n" + FormatParagraph(_("This is experimental Free Software! Fuck Yeah!!")) + "\n" +
"\n" + "\n" +
FormatParagraph(_("Distributed under the GPLv3 software license, see the accompanying file COPYING or <https://www.gnu.org/licenses/gpl-3.0.en.html>.")) + "\n" + FormatParagraph(_("Distributed under the GPLv3 software license, see the accompanying file COPYING or <https://www.gnu.org/licenses/gpl-3.0.en.html>.")) + "\n" +
"\n"; "\n";