Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -uNr godcoin/src/base58.h achilles/src/base58.h
- --- godcoin/src/base58.h 2014-07-27 14:24:36.034629925 +0100
- +++ achilles/src/base58.h 2014-07-27 14:26:27.378627441 +0100
- @@ -272,7 +272,7 @@
- public:
- enum
- {
- - PUBKEY_ADDRESS = 38, // Zencoin addresses start with G
- + PUBKEY_ADDRESS = 23,
- SCRIPT_ADDRESS = 5,
- PUBKEY_ADDRESS_TEST = 111,
- SCRIPT_ADDRESS_TEST = 196,
- diff -uNr godcoin/src/bitcoinrpc.cpp achilles/src/bitcoinrpc.cpp
- --- godcoin/src/bitcoinrpc.cpp 2014-07-27 14:24:36.050629925 +0100
- +++ achilles/src/bitcoinrpc.cpp 2014-07-27 14:26:27.398627441 +0100
- @@ -93,7 +93,7 @@
- int64 AmountFromValue(const Value& value)
- {
- double dAmount = value.get_real();
- - if (dAmount <= 0.0 || dAmount > 84000000.0)
- + if (dAmount <= 0.0 || dAmount > MAX_MONEY)
- throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount");
- int64 nAmount = roundint64(dAmount * COIN);
- if (!MoneyRange(nAmount))
- @@ -788,7 +788,7 @@
- // Try a dual IPv6/IPv4 socket, falling back to separate IPv4 and IPv6 sockets
- const bool loopback = !mapArgs.count("-rpcallowip");
- asio::ip::address bindAddress = loopback ? asio::ip::address_v6::loopback() : asio::ip::address_v6::any();
- - ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 12700));
- + ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 17255));
- boost::system::error_code v6_only_error;
- boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(*rpc_io_service));
- @@ -1070,7 +1070,7 @@
- asio::ssl::stream<asio::ip::tcp::socket> sslStream(io_service, context);
- SSLIOStreamDevice<asio::ip::tcp> d(sslStream, fUseSSL);
- iostreams::stream< SSLIOStreamDevice<asio::ip::tcp> > stream(d);
- - if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "12700")))
- + if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "17255")))
- throw runtime_error("couldn't connect to server");
- // HTTP basic authentication
- diff -uNr godcoin/src/checkpoints.cpp achilles/src/checkpoints.cpp
- --- godcoin/src/checkpoints.cpp 2014-07-27 14:24:36.054629925 +0100
- +++ achilles/src/checkpoints.cpp 2014-07-27 14:26:27.406627440 +0100
- @@ -35,19 +35,19 @@
- // + Contains no strange transactions
- static MapCheckpoints mapCheckpoints =
- boost::assign::map_list_of
- - ( 0, uint256("0x"))
- + ( 0, uint256("0x0000034e58835f5a592145ddb68adf4553513a5ca0ff02ddf51c0e2dcad59ca2"))
- ;
- static const CCheckpointData data = {
- &mapCheckpoints,
- - 1403493000, // * UNIX timestamp of last checkpoint block
- - 24000, // * total number of transactions between genesis and last checkpoint
- + 1406102641, // * UNIX timestamp of last checkpoint block
- + 1408, // * total number of transactions between genesis and last checkpoint
- // (the tx=... number in the SetBestChain debug.log lines)
- - 2400.0 // * estimated number of transactions per day after checkpoint
- + 250.0 // * estimated number of transactions per day after checkpoint
- };
- static MapCheckpoints mapCheckpointsTestnet =
- boost::assign::map_list_of
- - ( 0, uint256("0x0000c4e5b62e04d9e78c357fbaacfcfa78b3f2b16e43d15f9819e9430290af2"))
- + ( 0, uint256("0x"))
- ;
- static const CCheckpointData dataTestnet = {
- &mapCheckpointsTestnet,
- diff -uNr godcoin/src/init.cpp achilles/src/init.cpp
- --- godcoin/src/init.cpp 2014-07-27 14:24:36.038629925 +0100
- +++ achilles/src/init.cpp 2014-07-27 14:26:27.382627441 +0100
- @@ -307,7 +307,7 @@
- " -socks=<n> " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" +
- " -tor=<ip:port> " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n"
- " -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n" +
- - " -port=<port> " + _("Listen for connections on <port> (default: 12701 or testnet: 12721)") + "\n" +
- + " -port=<port> " + _("Listen for connections on <port> (default: 17256 or testnet: 12256)") + "\n" +
- " -maxconnections=<n> " + _("Maintain at most <n> connections to peers (default: 125)") + "\n" +
- " -addnode=<ip> " + _("Add a node to connect to and attempt to keep the connection open") + "\n" +
- " -connect=<ip> " + _("Connect only to the specified node(s)") + "\n" +
- @@ -350,7 +350,7 @@
- #endif
- " -rpcuser=<user> " + _("Username for JSON-RPC connections") + "\n" +
- " -rpcpassword=<pw> " + _("Password for JSON-RPC connections") + "\n" +
- - " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 12700 or testnet: 12720)") + "\n" +
- + " -rpcport=<port> " + _("Listen for JSON-RPC connections on <port> (default: 17255 or testnet: 12255)") + "\n" +
- " -rpcallowip=<ip> " + _("Allow JSON-RPC connections from specified IP address") + "\n" +
- #ifndef QT_GUI
- " -rpcconnect=<ip> " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n" +
- diff -uNr godcoin/src/main.cpp achilles/src/main.cpp
- --- godcoin/src/main.cpp 2014-07-27 14:24:36.022629926 +0100
- +++ achilles/src/main.cpp 2014-07-27 14:26:27.358627442 +0100
- @@ -31,7 +31,7 @@
- unsigned int nTransactionsUpdated = 0;
- map<uint256, CBlockIndex*> mapBlockIndex;
- -uint256 hashGenesisBlock("0x000000d33dc1866691d5a32ee21fcf8826958cfb40af3220f56c999414f258d5");
- +uint256 hashGenesisBlock("0x0000034e58835f5a592145ddb68adf4553513a5ca0ff02ddf51c0e2dcad59ca2");
- static CBigNum bnProofOfWorkLimit(~uint256(0) >> 20); // zencoin: starting difficulty is 1 / 2^12
- CBlockIndex* pindexGenesisBlock = NULL;
- @@ -1087,21 +1087,17 @@
- int64 nSubsidy = 0;
- if(nHeight==1)
- {
- - nSubsidy = 10080*COIN;
- + nSubsidy = 1100000*COIN;
- }
- - else if(nHeight<=140)
- + else if(nHeight>2)
- {
- - nSubsidy = 1 *COIN;
- - }
- - else if(nHeight>140)
- - {
- - nSubsidy = 7 *COIN;
- + nSubsidy = 80 *COIN;
- }
- return nSubsidy + nFees;
- }
- -static const int64 nTargetTimespan = 7 * 24 * 60 * 60; // Zencoin: 1 Day
- -static const int64 nTargetSpacing = 10 * 60; // Zencoin: 10 Minutes
- +static const int64 nTargetTimespan = 2.5 * 60; // Zencoin: 2.5 minutes
- +static const int64 nTargetSpacing = 2.5 * 60; // Zencoin: 2.5 Minutes
- static const int64 nInterval = nTargetTimespan / nTargetSpacing; // 72
- //
- @@ -3079,7 +3075,7 @@
- pchMessageStart[1] = 0x1a;
- pchMessageStart[2] = 0x2c;
- pchMessageStart[3] = 0xaf;
- - hashGenesisBlock = uint256("0x00000c4e5b62e04d9e78c357fbaacfcfa78b3f2b16e43d15f9819e9430290af2");
- + hashGenesisBlock = uint256("0x0000034e58835f5a592145ddb68adf4553513a5ca0ff02ddf51c0e2dcad59ca2");
- }
- //
- @@ -3112,34 +3108,34 @@
- // vMerkleTree: 97ddfbbae6
- // Genesis block
- - const char* pszTimestamp = " 20/5/14 Authorities have let The Malaysian Airlines flight MH370 disappear";
- + const char* pszTimestamp = "Zencoin Zencoin";
- CTransaction txNew;
- txNew.vin.resize(1);
- txNew.vout.resize(1);
- txNew.vin[0].scriptSig = CScript() << 486604799 << CBigNum(4) << vector<unsigned char>((const unsigned char*)pszTimestamp, (const unsigned char*)pszTimestamp + strlen(pszTimestamp));
- - txNew.vout[0].nValue = 7 * COIN;
- + txNew.vout[0].nValue = 80 * COIN;
- txNew.vout[0].scriptPubKey = CScript() << ParseHex("040184710fa689ad5023690c80f3a49c8f13f8d45b8c857fbcbc8bc4a8e4d3eb4b10f4d4604fa08dce601aaf0f470216fe1b51850b4acf21b179c45070ac7b03a9") << OP_CHECKSIG;
- CBlock block;
- block.vtx.push_back(txNew);
- block.hashPrevBlock = 0;
- block.hashMerkleRoot = block.BuildMerkleTree();
- block.nVersion = 1;
- - block.nTime = 1403493000;
- + block.nTime = 1406102641;
- block.nBits = 0x1e0ffff0;
- - block.nNonce = 1586544;
- + block.nNonce = 1118322;
- if (fTestNet)
- {
- - block.nTime = 1403414633;
- - block.nNonce = 590690;
- + block.nTime = 1406102641;
- + block.nNonce = 1118322;
- }
- -
- +
- //// debug print
- uint256 hash = block.GetHash();
- printf("%s\n", hash.ToString().c_str());
- printf("%s\n", hashGenesisBlock.ToString().c_str());
- printf("%s\n", block.hashMerkleRoot.ToString().c_str());
- - assert(block.hashMerkleRoot == uint256("0xedac2ffe17ec70f2433b92fafc72fabdb10446012bd00f4fc1c5e075edcba429"));
- + assert(block.hashMerkleRoot == uint256("0xab476d4d52343e0c21e4bc570491214ab88e8ae373d2df7095dee9b6d4c0c792"));
- block.print();
- assert(hash == hashGenesisBlock);
- diff -uNr godcoin/src/main.h achilles/src/main.h
- --- godcoin/src/main.h 2014-07-27 14:24:36.018629926 +0100
- +++ achilles/src/main.h 2014-07-27 14:30:36.694621878 +0100
- @@ -54,7 +54,7 @@
- /** Dust Hard Limit, ignored as wallet inputs (mininput default) */
- static const int64 DUST_HARD_LIMIT = 1000; // 0.00001 ZENZ mininput
- /** No amount larger than this (in satoshi) is valid */
- -static const int64 MAX_MONEY = 21000000 * COIN;
- +static const int64 MAX_MONEY = 22000000 * COIN;
- inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
- /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
- static const int COINBASE_MATURITY = 25;
- @@ -623,7 +623,7 @@
- {
- // Large (in bytes) low-priority (new, small-coin) transactions
- // need a fee.
- - return dPriority > COIN * 144 / 250; //144 blocks
- + return dPriority > COIN * 576 / 250; //144 blocks
- }
- // Apply the effects of this transaction on the UTXO set represented by view
- diff -uNr godcoin/src/net.cpp achilles/src/net.cpp
- --- godcoin/src/net.cpp 2014-07-27 14:24:36.026629926 +0100
- +++ achilles/src/net.cpp 2014-07-27 14:26:27.362627441 +0100
- @@ -1193,10 +1193,6 @@
- // The second name should resolve to a list of seed addresses.
- static const char *strMainNetDNSSeed[][2] = {
- - {"162.243.151.67", "162.243.151.67"},
- - {"192.241.184.85", "192.241.184.85"},
- - {"188.226.248.45", "188.226.248.45"},
- - {"128.199.165.180", "128.199.165.180"},
- {NULL, NULL},
- };
- diff -uNr godcoin/src/protocol.h achilles/src/protocol.h
- --- godcoin/src/protocol.h 2014-07-27 14:24:36.030629926 +0100
- +++ achilles/src/protocol.h 2014-07-27 14:26:27.374627441 +0100
- @@ -18,7 +18,7 @@
- extern bool fTestNet;
- static inline unsigned short GetDefaultPort(const bool testnet = fTestNet)
- {
- - return testnet ? 12721 : 12701;
- + return testnet ? 12256 : 17256;
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement