Advertisement
Guest User

darkether - bitpopcoin code diff

a guest
Aug 10th, 2015
356
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 8.38 KB | None | 0 0
  1. gjh@ashpool:~/minkiz/coinage/workbench/stripped$ diff -uNr bitpop darkether
  2. diff -uNr bitpop/src/base58.h darkether/src/base58.h
  3. --- bitpop/src/base58.h 2015-08-10 10:37:40.700946047 +0100
  4. +++ darkether/src/base58.h  2015-08-10 10:40:37.312950910 +0100
  5. @@ -276,7 +276,7 @@
  6.  public:
  7.      enum
  8.      {
  9. -        PUBKEY_ADDRESS = 25,
  10. +        PUBKEY_ADDRESS = 33,
  11.          SCRIPT_ADDRESS = 28,
  12.          PUBKEY_ADDRESS_TEST = 111,
  13.          SCRIPT_ADDRESS_TEST = 196,
  14. diff -uNr bitpop/src/bitcoinrpc.cpp darkether/src/bitcoinrpc.cpp
  15. --- bitpop/src/bitcoinrpc.cpp   2015-08-10 10:37:40.712946047 +0100
  16. +++ darkether/src/bitcoinrpc.cpp    2015-08-10 10:40:37.328950911 +0100
  17. @@ -42,7 +42,7 @@
  18.  
  19.  static inline unsigned short GetDefaultRPCPort()
  20.  {
  21. -    return GetBoolArg("-testnet", false) ? 45439 : 45437;
  22. +    return GetBoolArg("-testnet", false) ? 11333 : 10332;
  23.  }
  24.  
  25.  Object JSONRPCError(int code, const string& message)
  26. diff -uNr bitpop/src/init.cpp darkether/src/init.cpp
  27. --- bitpop/src/init.cpp 2015-08-10 10:37:40.700946047 +0100
  28. +++ darkether/src/init.cpp  2015-08-10 10:40:37.316950910 +0100
  29. @@ -241,7 +241,7 @@
  30.          "  -socks=<n>             " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" +
  31.          "  -tor=<ip:port>         " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n"
  32.          "  -dns                   " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n" +
  33. -        "  -port=<port>           " + _("Listen for connections on <port> (default: 45438 or testnet: 45439)") + "\n" +
  34. +        "  -port=<port>           " + _("Listen for connections on <port> (default: 10333 or testnet: 11333)") + "\n" +
  35.          "  -maxconnections=<n>    " + _("Maintain at most <n> connections to peers (default: 125)") + "\n" +
  36.          "  -addnode=<ip>          " + _("Add a node to connect to and attempt to keep the connection open") + "\n" +
  37.          "  -connect=<ip>          " + _("Connect only to the specified node(s)") + "\n" +
  38. @@ -287,7 +287,7 @@
  39.  #endif
  40.          "  -rpcuser=<user>        " + _("Username for JSON-RPC connections") + "\n" +
  41.          "  -rpcpassword=<pw>      " + _("Password for JSON-RPC connections") + "\n" +
  42. -        "  -rpcport=<port>        " + _("Listen for JSON-RPC connections on <port> (default: 45437 or testnet: 45439)") + "\n" +
  43. +        "  -rpcport=<port>        " + _("Listen for JSON-RPC connections on <port> (default: 10332 or testnet: 11333)") + "\n" +
  44.          "  -rpcallowip=<ip>       " + _("Allow JSON-RPC connections from specified IP address") + "\n" +
  45.          "  -rpcconnect=<ip>       " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n" +
  46.          "  -blocknotify=<cmd>     " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n" +
  47. diff -uNr bitpop/src/main.cpp darkether/src/main.cpp
  48. --- bitpop/src/main.cpp 2015-08-10 10:37:40.692946047 +0100
  49. +++ darkether/src/main.cpp  2015-08-10 10:40:37.308950910 +0100
  50. @@ -40,12 +40,12 @@
  51.  CBigNum bnProofOfStakeLimit(~uint256(0) >> 20);
  52.  CBigNum bnProofOfWorkLimitTestNet(~uint256(0) >> 16);
  53.  
  54. -unsigned int nTargetSpacing = 5 * 60; // 5 minutes
  55. -unsigned int nStakeMinAge = 8 * 60 * 60; // 8 hours
  56. +unsigned int nTargetSpacing = 1.5 * 60; // 1.5 minutes
  57. +unsigned int nStakeMinAge = 5 * 60 * 60; // 5 hours
  58.  unsigned int nStakeMaxAge = 30 * 24 * 60 * 60;           // 30 days
  59.  unsigned int nModifierInterval = 10 * 60; // time to elapse before new modifier is computed
  60.  
  61. -int nCoinbaseMaturity = 30;
  62. +int nCoinbaseMaturity = 10;
  63.  CBlockIndex* pindexGenesisBlock = NULL;
  64.  int nBestHeight = -1;
  65.  
  66. @@ -966,7 +966,7 @@
  67.  // miner's coin base reward
  68.  int64_t GetProofOfWorkReward(int64_t nFees)
  69.  {
  70. -    int64_t nSubsidy = 500 * COIN;
  71. +    int64_t nSubsidy = 1069 * COIN;
  72.  
  73.    
  74.      if (fDebug && GetBoolArg("-printcreation"))
  75. @@ -2455,9 +2455,9 @@
  76.  
  77.      if (fTestNet)
  78.      {
  79. -        pchMessageStart[0] = 0xa1;
  80. +        pchMessageStart[0] = 0xb1;
  81.          pchMessageStart[1] = 0xa0;
  82. -        pchMessageStart[2] = 0xa2;
  83. +        pchMessageStart[2] = 0xd2;
  84.          pchMessageStart[3] = 0xa3;
  85.  
  86.          bnProofOfWorkLimit = bnProofOfWorkLimitTestNet; // 0x0000ffff PoW base target is fixed in testnet
  87. @@ -2484,9 +2484,9 @@
  88.          if (!fAllowNew)
  89.              return false;
  90.  
  91. -        const char* pszTimestamp = "Beat that!";
  92. +        const char* pszTimestamp = "My Milkshake Brings All The Boys To The Yard!";
  93.          CTransaction txNew;
  94. -        txNew.nTime = 1404762471;
  95. +        txNew.nTime = 1439073391;
  96.          txNew.vin.resize(1);
  97.          txNew.vout.resize(1);
  98.          txNew.vin[0].scriptSig = CScript() << 0 << CBigNum(42) << vector<unsigned char>((const unsigned char*)pszTimestamp, (const unsigned char*)pszTimestamp + strlen(pszTimestamp));
  99. @@ -2496,12 +2496,12 @@
  100.          block.hashPrevBlock = 0;
  101.          block.hashMerkleRoot = block.BuildMerkleTree();
  102.          block.nVersion = 1;
  103. -        block.nTime    = 1404762480;
  104. +        block.nTime    = 1439073391;
  105.          block.nBits    = bnProofOfWorkLimit.GetCompact();
  106. -        block.nNonce   = 6869289;
  107. +        block.nNonce   = 1103460;
  108.         if(fTestNet)
  109.          {
  110. -            block.nNonce   = 6869289;
  111. +            block.nNonce   = 1103460;
  112.          }
  113.          if (false  && (block.GetHash() != hashGenesisBlock)) {
  114.  
  115. @@ -2525,7 +2525,7 @@
  116.          printf("block.nNonce = %u \n", block.nNonce);
  117.  
  118.          //// debug print
  119. -        assert(block.hashMerkleRoot == uint256("0xd4695cbda427a5da4ca141346d4d040d9a95c22ab71fbe1e8bf6aaefd01365aa"));
  120. +        assert(block.hashMerkleRoot == uint256("0x0331184f0f4d667fe8b4e2f38661729e184f056b985a797798da78278ed71c54"));
  121.          assert(block.GetHash() == (!fTestNet ? hashGenesisBlock : hashGenesisBlockTestNet));
  122.  
  123.          // Start new block file
  124. diff -uNr bitpop/src/main.h darkether/src/main.h
  125. --- bitpop/src/main.h   2015-08-10 10:37:40.688946046 +0100
  126. +++ darkether/src/main.h    2015-08-10 10:40:37.304950910 +0100
  127. @@ -27,7 +27,7 @@
  128.  class CRequestTracker;
  129.  class CNode;
  130.  
  131. -static const int LAST_POW_BLOCK = 525600;
  132. +static const int LAST_POW_BLOCK = 15000;
  133.  
  134.  static const unsigned int MAX_BLOCK_SIZE = 1000000;
  135.  static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2;
  136. @@ -37,8 +37,8 @@
  137.  static const int64_t MIN_TX_FEE = 1000;
  138.  static const int64_t MIN_RELAY_TX_FEE = MIN_TX_FEE;
  139.  static const int64_t MAX_MONEY = 500000000 * COIN;
  140. -static const int64_t COIN_YEAR_REWARD = 7 * CENT; // 7% per year
  141. -static const int64_t MAX_MINT_PROOF_OF_STAKE = 0.07 * COIN;    // 7% annual interest
  142. +static const int64_t COIN_YEAR_REWARD = 22 * CENT; // 22% per year
  143. +static const int64_t MAX_MINT_PROOF_OF_STAKE = 0.22 * COIN;    // 22% annual interest
  144.  static const int MODIFIER_INTERVAL_SWITCH = 1;
  145.  
  146.  inline bool MoneyRange(int64_t nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
  147. @@ -51,8 +51,8 @@
  148.  static const int fHaveUPnP = false;
  149.  #endif
  150.  
  151. -static const uint256 hashGenesisBlock("0x00000577cce4b2d686a4943fe9e9424183cb2226874e859119d478ad2a926637");
  152. -static const uint256 hashGenesisBlockTestNet("0x00000577cce4b2d686a4943fe9e9424183cb2226874e859119d478ad2a926637");
  153. +static const uint256 hashGenesisBlock("0x3f3ad5396aad6df4047260fda9f7c27bb6aaf8f6405872b79015dabada77408b");
  154. +static const uint256 hashGenesisBlockTestNet("0x54daa786bd5101855c5cfdcf4303cf678ec95beddfc4967554f8ab16f1c5f4b0");
  155.  inline int64_t PastDrift(int64_t nTime)   { return nTime - 10 * 60; } // up to 10 minutes from the past
  156.  inline int64_t FutureDrift(int64_t nTime) { return nTime + 10 * 60; } // up to 10 minutes from the future
  157.  
  158. diff -uNr bitpop/src/net.cpp darkether/src/net.cpp
  159. --- bitpop/src/net.cpp  2015-08-10 10:37:40.692946047 +0100
  160. +++ darkether/src/net.cpp   2015-08-10 10:40:37.308950910 +0100
  161. @@ -1139,7 +1139,7 @@
  162.  // The first name is used as information source for addrman.
  163.  // The second name should resolve to a list of seed addresses.
  164.  static const char *strDNSSeed[][2] = {
  165. -       {"108.61.72.49", "108.61.72.49"},
  166. +       {"coinworld.cloudapp.net", "40.76.89.100"},
  167.    
  168.  };
  169.  
  170. diff -uNr bitpop/src/protocol.h darkether/src/protocol.h
  171. --- bitpop/src/protocol.h   2015-08-10 10:37:40.696946047 +0100
  172. +++ darkether/src/protocol.h    2015-08-10 10:40:37.312950910 +0100
  173. @@ -18,7 +18,7 @@
  174.  extern bool fTestNet;
  175.  static inline unsigned short GetDefaultPort(const bool testnet = fTestNet)
  176.  {
  177. -    return testnet ? 45439 : 45438;
  178. +    return testnet ? 11333 : 10333;
  179.  }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement