Merge pull request #1 from XSECURUS/devx

Devx

configure.ac

@@ -1,7 +1,7 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
-define(_CLIENT_VERSION_MAJOR, 1)
-define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_MAJOR, 2)
+define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

contrib/debian/manpages/pivx-qt.1

@@ -41,7 +41,7 @@ Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR)
 Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR
 .TP
 \fB\-port=\fR<port>
-Listen for connections on <port> (default: 20201 or testnet: 120201)
+Listen for connections on <port> (default: 20201 or testnet: 20204)
 .TP
 \fB\-maxconnections=\fR<n>
 Maintain at most <n> connections to peers (default: 125)
@@ -122,7 +122,7 @@ Username for JSON\-RPC connections
 Password for JSON\-RPC connections
 .TP
 \fB\-rpcport=\fR<port>
-Listen for JSON\-RPC connections on <port> (default: 20202 or testnet: 20202)
+Listen for JSON\-RPC connections on <port> (default: 20202 or testnet: 20204)
 .TP
 \fB\-rpcallowip=\fR<ip>
 Allow JSON\-RPC connections from specified IP address

contrib/gitian-build.py

@@ -23,9 +23,9 @@ def setup():
         programs += ['lxc', 'debootstrap']
     subprocess.check_call(['sudo', 'apt-get', 'install', '-qq'] + programs)
     if not os.path.isdir('gitian.sigs'):
-        subprocess.check_call(['git', 'clone', 'https://github.com/securuschain/gitian.sigs.git'])
+        subprocess.check_call(['git', 'clone', 'https://github.com/XSECURUS/xsecurus/gitian.sigs.git'])
     if not os.path.isdir('bitcoin-detached-sigs'):
-        subprocess.check_call(['git', 'clone', 'https://github.com/securuschain/securus-detached-sigs.git'])
+        subprocess.check_call(['git', 'clone', 'https://github.com/XSECURUS/xsecurus/securus-detached-sigs.git'])
     if not os.path.isdir('gitian-builder'):
         subprocess.check_call(['git', 'clone', 'https://github.com/devrandom/gitian-builder.git'])
     if not os.path.isdir('bitcoin'):
@@ -140,7 +140,7 @@ def main():
     parser = argparse.ArgumentParser(usage='%(prog)s [options] signer version')
     parser.add_argument('-c', '--commit', action='store_true', dest='commit', help='Indicate that the version argument is for a commit or branch')
     parser.add_argument('-p', '--pull', action='store_true', dest='pull', help='Indicate that the version argument is the number of a github repository pull request')
-    parser.add_argument('-u', '--url', dest='url', default='https://github.com/securuschain/securus', help='Specify the URL of the repository. Default is %(default)s')
+    parser.add_argument('-u', '--url', dest='url', default='https://github.com/XSECURUS/securus', help='Specify the URL of the repository. Default is %(default)s')
     parser.add_argument('-v', '--verify', action='store_true', dest='verify', help='Verify the Gitian build')
     parser.add_argument('-b', '--build', action='store_true', dest='build', help='Do a Gitian build')
     parser.add_argument('-s', '--sign', action='store_true', dest='sign', help='Make signed binaries for Windows and MacOS')

contrib/gitian-descriptors/gitian-aarch64.yml

@@ -1,5 +1,5 @@
 ---
-name: "securus-aarch64-0.16.0"
+name: "securus-aarch64-2.0.0"
 enable_cache: true
 suites:
 - "xenial"

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "securus-linux-0.16.0"
+name: "securus-linux-2.0.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-osx-signer.yml

@@ -7,7 +7,7 @@ architectures:
 packages:
 - "faketime"
 remotes:
-- "url": "https://github.com/securuschain/securus-detached-sigs.git"
+- "url": "https://github.com/XSECURUS/xsecurus/securus-detached-sigs.git"
   "dir": "signature"
 files:
 - "securus-osx-unsigned.tar.gz"

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "securus-osx-0.16.0"
+name: "securus-osx-2.0.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-win-signer.yml

@@ -8,7 +8,7 @@ packages:
 - "libssl-dev"
 - "autoconf"
 remotes:
-- "url": "https://github.com/securuschain/securus-detached-sigs.git"
+- "url": "https://github.com/XSECURUS/xsecurus/securus-detached-sigs.git"
   "dir": "signature"
 files:
 - "osslsigncode-1.7.1.tar.gz"

contrib/gitian-descriptors/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "securus-win-0.16.0"
+name: "securus-win-2.0.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/seeds/generate-seeds.py

@@ -130,7 +130,7 @@ def main():
         process_nodes(g, f, 'pnSeed6_main', 20201)
     g.write('\n')
     with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
-        process_nodes(g, f, 'pnSeed6_test', 120201)
+        process_nodes(g, f, 'pnSeed6_test', 20201)
     g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n')
 
 if __name__ == '__main__':

share/genbuild.sh

@@ -14,7 +14,7 @@ else
     exit 1
 fi
 
-DESC=""
+DESC="2.0.0"
 SUFFIX=""
 LAST_COMMIT_DATE=""
 

src/bitcoin-cli.cpp

@@ -40,7 +40,7 @@ std::string HelpMessageCli()
     strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be "
                                              "solved instantly. This is intended for regression testing tools and app development."));
     strUsage += HelpMessageOpt("-rpcconnect=<ip>", strprintf(_("Send commands to node running on <ip> (default: %s)"), "127.0.0.1"));
-    strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Connect to JSON-RPC on <port> (default: %u or testnet: %u)"), 20202, 20202));
+    strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Connect to JSON-RPC on <port> (default: %u or testnet: %u)"), 20202, 20204));
     strUsage += HelpMessageOpt("-rpcwait", _("Wait for RPC server to start"));
     strUsage += HelpMessageOpt("-rpcuser=<user>", _("Username for JSON-RPC connections"));
     strUsage += HelpMessageOpt("-rpcpassword=<pw>", _("Password for JSON-RPC connections"));

src/chainparams.cpp

@@ -93,7 +93,10 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
     (   300000, uint256("bda488cab11d22a4a1939e2a824a8fbecae4e157fcee1ed4c250ac16cd70d651"))
     (   310000, uint256("33a6a14c2420bde6588ea98286d2cc2baf8b7be36706b5acf1ed50e6fdb74e0e"))
     (   320000, uint256("2c2a76221572188a73b778a0b7f96e6f96aff068abb18d4d6f813e07a0a2eed6"))
-    (   330000, uint256("ad6b6e2f66aeb77441f48a63e7849016faed01dcfec42c00f2988b7c95bc7440"));
+    (   330000, uint256("ad6b6e2f66aeb77441f48a63e7849016faed01dcfec42c00f2988b7c95bc7440"))
+    (   340000, uint256("22dca52c62a24dd187cf6354adc64beef26bfcf6e07b27868709e716c4c7a939"))
+    (   350000, uint256("88eb4b9183008128f2ddc5a2dc04ec334b488a9657e6e87ede45c2564d2c02d8"))
+    (   360000, uint256("c04972e28f98657779973222bde42b31fe5210676343556d705862111eb8d7e6"));
 
 static const Checkpoints::CCheckpointData data = {
     &mapCheckpoints,
@@ -104,7 +107,7 @@ static const Checkpoints::CCheckpointData data = {
 
 static Checkpoints::MapCheckpoints mapCheckpointsTestnet =
     boost::assign::map_list_of
-    (0, uint256("00000fc011e0d753e70317369916e01c74881e3981f0aab77bd839f48f9c869d"));
+    (0, uint256("0x00000e1dbef83856b13cfb95aa8665a2b41f6c38f4774ec78ca4ae55a7b4024e"));
 static const Checkpoints::CCheckpointData dataTestnet = {
     &mapCheckpointsTestnet,
     1584392500,
@@ -172,6 +175,7 @@ class CMainParams : public CChainParams
         /** Height or Time Based Activations **/
         //nLastPOWBlock = 20160; // 14 days @ 1440 per day (PIVX: 259200, Phore 200)
         nLastPOWBlock = 200; // Short PoW phase before transition to PoS
+        nDevFundBlock = 400000; //start dev wallet phase
         //if the lowest block height (vSortedByTimestamp[0]) is >= switch height, use new modifier calc
         // nModifierUpdateBlock = 0; // (PIVX: 615800)
         nZerocoinStartHeight = 999999999; // (PIVX: 863787, Phore 90000)
@@ -205,12 +209,13 @@ class CMainParams : public CChainParams
         assert(hashGenesisBlock == uint256("00000e1dbef83856b13cfb95aa8665a2b41f6c38f4774ec78ca4ae55a7b4024e"));
         assert(genesis.hashMerkleRoot == uint256("44c3a39b62469d1f8a622e47077ed3c903c54e40b698528f44be5f35ea526030"));
 
-        vSeeds.push_back(CDNSSeedData("peer1", "85.214.153.128"));
-        vSeeds.push_back(CDNSSeedData("peer2", "81.169.244.95"));
-        //vSeeds.push_back(CDNSSeedData("peer3", "85.214.24.190"));
+        vSeeds.push_back(CDNSSeedData("seed", "seed.securuscoin.org"));
+        vSeeds.push_back(CDNSSeedData("seed2", "seed2.securuscoin.org"));
+        // vSeeds.push_back(CDNSSeedData("peer1", "85.214.153.128"));
+        // vSeeds.push_back(CDNSSeedData("peer2", "81.169.244.95"));
+        // vSeeds.push_back(CDNSSeedData("peer3", "85.214.24.190"));
+        // vSeeds.push_back(CDNSSeedData("peer4", "85.209.48.159"));
 
-        vSeeds.push_back(CDNSSeedData("peer4", "85.209.48.159"));
-        vSeeds.push_back(CDNSSeedData("felix", "185.239.238.230"));
 
         // Securus addresses start with 'S'
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,75);
@@ -237,7 +242,7 @@ class CMainParams : public CChainParams
         fHeadersFirstSyncingActive = false;
 
         nPoolMaxTransactions = 3;
-        strSporkKey = "049ac4716b7ee04606680a3263c07dbf422afa466f14ae6085f4ddde666cef6b147db003bcd36a0c9bf437e78a717c380c163e5ad0a5dd8c7017eca69873bb1cb6";
+        strSporkKey = "04a3f031e5c1b337c9b4d34ed595f7568acb9ec81c2b4b956abb63ee67b7a39ba25628ec76748b9cd2cfd95cc4eb90a1775500ac97d4adb6d334a54fdf8c6a8f81";
         strSporkKeyOld = "04beb92bb57470a4e6b011a291026c8cb6ce59c20b36ae5128d88b723c198443cb35cb2609eb9054f9fc49aa9f49257026cd1a09afb3fd7e1429086ab708ffb482";
         strObfuscationPoolDummyAddress = "X87q2gC9j6nNrnzCsg4aY6bHMLsT9nUhEw";
         nStartMasternodePayments = 1527634800; // 2018-05-30 00:00:00
@@ -258,14 +263,30 @@ class CMainParams : public CChainParams
         nZerocoinRequiredStakeDepth = 200; //The required confirmations for a zpiv to be stakable
 
         nBudget_Fee_Confirmations = 6; // Number of confirmations for the finalization fee
+
     }
 
     const Checkpoints::CCheckpointData& Checkpoints() const
     {
         return data;
     }
 };
+
 static CMainParams mainParams;
+// dev wallet
+std::string CChainParams::GetDevFeeRewardAddress()
+{
+	// return "mxe3eWJRya31h49qrATsyWx8fJBKfF6uLk";  //TESTNET
+    return "XXT8EMfCATTnzK1Qr5cTiTTMDZ2UMvenpQ";  //MAINNET
+}
+
+CScript CChainParams::GetScriptForDevFeeDestination() {
+    CBitcoinAddress address(GetDevFeeRewardAddress().c_str());
+    assert(address.IsValid());
+
+    CScript script = GetScriptForDestination(address.Get());
+    return script;
+}
 
 /**
  * Testnet (v3)
@@ -291,8 +312,9 @@ class CTestNetParams : public CMainParams
         nMinerThreads = 1;
         nTargetTimespan = 24 * 60 * 60; // Securus: 1 day
         nTargetSpacing = 60;  // Securus: 1 minute
-        nLastPOWBlock = 400;
-        nMaturity = 15;
+        nLastPOWBlock = 250;
+        nDevFundBlock = 300; //dev wallet testnetstart
+        nMaturity = 1;
         nMasternodeCountDrift = 2;
         // nModifierUpdateBlock = 0; //approx Mon, 17 Apr 2017 04:00:00 GMT
         nMaxMoneyOut = 21000000 * COIN;
@@ -310,13 +332,48 @@ class CTestNetParams : public CMainParams
 
         //! Modify the testnet genesis block so the timestamp is valid for a later start.
         genesis.nTime = 1584392500;
-        genesis.nNonce = 311676;
+        genesis.nNonce = 977889;
 
         hashGenesisBlock = genesis.GetHash();
-        assert(hashGenesisBlock == uint256("c5f7a41bf0ab35cc0b12d275d5f5003ec0a683ff932226382016a472ab8cc24f"));
+
+        if (regenerate) {
+            hashGenesisBlock = uint256S("");
+            genesis.nNonce = 0;
+            if (true && (genesis.GetHash() != hashGenesisBlock)) {
+                uint256 hashTarget = CBigNum().SetCompact(genesis.nBits).getuint256();
+                while (genesis.GetHash() > hashTarget)
+                {
+                    ++genesis.nNonce;
+                    if (genesis.nNonce == 0)
+                    {
+                        ++genesis.nTime;
+                    }
+                }
+                std::cout << "// Testnet ---";
+                std::cout << " nonce: " << genesis.nNonce;
+                std::cout << " time: " << genesis.nTime;
+                std::cout << " hash: 0x" << genesis.GetHash().ToString().c_str();
+                std::cout << " merklehash: 0x"  << genesis.hashMerkleRoot.ToString().c_str() <<  "\n";
+
+            }
+        } else {
+            LogPrintf("Testnet ---\n");
+            LogPrintf(" nonce: %u\n", genesis.nNonce);
+            LogPrintf(" time: %u\n", genesis.nTime);
+            LogPrintf(" hash: 0x%s\n", genesis.GetHash().ToString().c_str());
+            LogPrintf(" merklehash: 0x%s\n", genesis.hashMerkleRoot.ToString().c_str());
+            assert(hashGenesisBlock == uint256("0x00000e1dbef83856b13cfb95aa8665a2b41f6c38f4774ec78ca4ae55a7b4024e"));
+            assert(genesis.hashMerkleRoot == uint256("0x44c3a39b62469d1f8a622e47077ed3c903c54e40b698528f44be5f35ea526030"));
+        }
 
         vFixedSeeds.clear();
         vSeeds.clear();
+        vSeeds.push_back(CDNSSeedData("peer1", "85.214.153.128"));
+        vSeeds.push_back(CDNSSeedData("peer2", "81.169.244.95"));
+        //vSeeds.push_back(CDNSSeedData("peer3", "85.214.24.190"));
+
+        vSeeds.push_back(CDNSSeedData("peer4", "85.209.48.159"));
+        vSeeds.push_back(CDNSSeedData("felix", "85.214.24.190"));
 
 
         // Testnet Securus addresses start with 'm' or 'n'
@@ -343,7 +400,7 @@ class CTestNetParams : public CMainParams
         fTestnetToBeDeprecatedFieldRPC = true;
 
         nPoolMaxTransactions = 2;
-        strSporkKey = "0429929bc9edbbdbee4830f004d0265608fbcc4caa9feff1fe58ff97354ddcf125b1c1636663d3f447d6c29d7b04bcb6fc492d2955c567be65ecb63fa2cbe2ce36";
+        strSporkKey = "040e0c130f23e1eaf814706f03bcb5f93fdb51ef7b79806cb84703d81dc144497616468417a1585bb8c4034ca4dc0cf4c17424832151e607763c96b9cafa238f1f";
         strSporkKeyOld = "04beb92bb57470a4e6b011a291026c8cb6ce59c20b36ae5128d88b723c198443cb35cb2609eb9054f9fc49aa9f49257026cd1a09afb3fd7e1429086ab708ffb482";
         strObfuscationPoolDummyAddress = "m57cqfGRkekRyDRNeJiLtYVEbvhXrNbmox";
         nStartMasternodePayments = 1527634800; //30th May 2018 00:00:00

src/chainparams.h

@@ -92,6 +92,8 @@ class CChainParams
     const std::vector<CAddress>& FixedSeeds() const { return vFixedSeeds; }
     virtual const Checkpoints::CCheckpointData& Checkpoints() const = 0;
     int PoolMaxTransactions() const { return nPoolMaxTransactions; }
+    static std::string GetDevFeeRewardAddress();
+    static CScript GetScriptForDevFeeDestination();
 
     /** Spork key and Masternode Handling **/
     std::string SporkKey() const { return strSporkKey; }
@@ -118,6 +120,8 @@ class CChainParams
     /** Height or Time Based Activations **/
     // int ModifierUpgradeBlock() const { return nModifierUpdateBlock; }
     int LAST_POW_BLOCK() const { return nLastPOWBlock; }
+    int DEV_FUND_BLOCK() const { return nDevFundBlock; }
+
     int Zerocoin_StartHeight() const { return nZerocoinStartHeight; }
     // int Zerocoin_Block_EnforceSerialRange() const { return nBlockEnforceSerialRange; }
     int Zerocoin_Block_RecalculateAccumulators() const { return nBlockRecalculateAccumulators; }
@@ -145,6 +149,7 @@ class CChainParams
     int64_t nTargetTimespan;
     int64_t nTargetSpacing;
     int nLastPOWBlock;
+    int nDevFundBlock;
     int nMasternodeCountDrift;
     int nMaturity;
     int nModifierUpdateBlock;

src/chainparamsbase.cpp

@@ -37,8 +37,8 @@ class CBaseTestNetParams : public CBaseMainParams
     CBaseTestNetParams()
     {
         networkID = CBaseChainParams::TESTNET;
-        nRPCPort = 20202;
-        strDataDir = "testnet4";
+        nRPCPort = 20204;
+        strDataDir = "devwallettest";
     }
 };
 static CBaseTestNetParams testNetParams;

src/chainparamsseeds.h

@@ -8,14 +8,12 @@
  * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
  */
 static SeedSpec6 pnSeed6_main[] = {
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x99,0x80}, 20201},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x51,0xa9,0xf4,0x5f}, 20201},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xef,0xee,0xe6}, 20201},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd1,0x30,0x9f}, 20201},
-    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xdf,0x1c,0xac}, 20201}
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd1,0x30,0x9f}, 20201}
+
 };
 
 static SeedSpec6 pnSeed6_test[] = {
-
+    {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x99,0x80}, 20203},
 };
 #endif // BITCOIN_CHAINPARAMSSEEDS_H

src/init.cpp

@@ -408,7 +408,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-onlynet=<net>", _("Only connect to nodes in network <net> (ipv4, ipv6 or onion)"));
     strUsage += HelpMessageOpt("-permitbaremultisig", strprintf(_("Relay non-P2SH multisig (default: %u)"), 1));
     strUsage += HelpMessageOpt("-peerbloomfilters", strprintf(_("Support filtering of blocks and transaction with bloom filters (default: %u)"), DEFAULT_PEERBLOOMFILTERS));
-    strUsage += HelpMessageOpt("-port=<port>", strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), 20201, 120201));
+    strUsage += HelpMessageOpt("-port=<port>", strprintf(_("Listen for connections on <port> (default: %u or testnet: %u)"), 20201, 20203));
     strUsage += HelpMessageOpt("-proxy=<ip:port>", _("Connect through SOCKS5 proxy"));
     strUsage += HelpMessageOpt("-proxyrandomize", strprintf(_("Randomize credentials for every proxy connection. This enables Tor stream isolation (default: %u)"), 1));
     strUsage += HelpMessageOpt("-seednode=<ip>", _("Connect to a node to retrieve peer addresses, and disconnect"));
@@ -567,7 +567,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-rpccookiefile=<loc>", _("Location of the auth cookie (default: data dir)"));
     strUsage += HelpMessageOpt("-rpcuser=<user>", _("Username for JSON-RPC connections"));
     strUsage += HelpMessageOpt("-rpcpassword=<pw>", _("Password for JSON-RPC connections"));
-    strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"), 20202, 20202));
+    strUsage += HelpMessageOpt("-rpcport=<port>", strprintf(_("Listen for JSON-RPC connections on <port> (default: %u or testnet: %u)"), 20202, 20204));
     strUsage += HelpMessageOpt("-rpcallowip=<ip>", _("Allow JSON-RPC connections from specified source. Valid for <ip> are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times"));
     strUsage += HelpMessageOpt("-rpcthreads=<n>", strprintf(_("Set the number of threads to service RPC calls (default: %d)"), DEFAULT_HTTP_THREADS));
     if (GetBoolArg("-help-debug", false)) {