API tools faq
paste
Advertisement
Guest User

godcoin/achilles mindiff

a guest
Jul 28th, 2014
663
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.00 KB | None | 0 0
raw download clone embed print report
  1. $ diff --exclude-from=notthese -bNr --context=0 godcoin/src achilles/src
  2. diff '--exclude-from=notthese' -bNr '--context=0' godcoin/src/base58.h achilles/src/base58.h
  3. *** godcoin/src/base58.h    2014-07-27 14:24:36.034629925 +0100
  4. --- achilles/src/base58.h   2014-07-27 14:26:27.378627441 +0100
  5. ***************
  6. *** 275 ****
  7. !         PUBKEY_ADDRESS = 38, // Zencoin addresses start with G
  8. --- 275 ----
  9. !         PUBKEY_ADDRESS = 23,
  10. diff '--exclude-from=notthese' -bNr '--context=0' godcoin/src/bitcoinrpc.cpp achilles/src/bitcoinrpc.cpp
  11. *** godcoin/src/bitcoinrpc.cpp  2014-07-27 14:24:36.050629925 +0100
  12. --- achilles/src/bitcoinrpc.cpp 2014-07-27 14:26:27.398627441 +0100
  13. ***************
  14. *** 96 ****
  15. !     if (dAmount <= 0.0 || dAmount > 84000000.0)
  16. --- 96 ----
  17. !     if (dAmount <= 0.0 || dAmount > MAX_MONEY)
  18. ***************
  19. *** 791 ****
  20. !     ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 12700));
  21. --- 791 ----
  22. !     ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 17255));
  23. ***************
  24. *** 1073 ****
  25. !     if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "12700")))
  26. --- 1073 ----
  27. !     if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "17255")))
  28. diff '--exclude-from=notthese' -bNr '--context=0' godcoin/src/checkpoints.cpp achilles/src/checkpoints.cpp
  29. *** godcoin/src/checkpoints.cpp 2014-07-27 14:24:36.054629925 +0100
  30. --- achilles/src/checkpoints.cpp    2014-07-27 14:26:27.406627440 +0100
  31. ***************
  32. *** 38 ****
  33. !         (  0, uint256("0x"))
  34. --- 38 ----
  35. !         (       0, uint256("0x0000034e58835f5a592145ddb68adf4553513a5ca0ff02ddf51c0e2dcad59ca2"))
  36. ***************
  37. *** 42,43 ****
  38. !         1403493000, // * UNIX timestamp of last checkpoint block
  39. !         24000,    // * total number of transactions between genesis and last checkpoint
  40. --- 42,43 ----
  41. !         1406102641, // * UNIX timestamp of last checkpoint block
  42. !         1408,    // * total number of transactions between genesis and last checkpoint
  43. ***************
  44. *** 45 ****
  45. !         2400.0     // * estimated number of transactions per day after checkpoint
  46. --- 45 ----
  47. !         250.0     // * estimated number of transactions per day after checkpoint
  48. ***************
  49. *** 50 ****
  50. !         (  0, uint256("0x0000c4e5b62e04d9e78c357fbaacfcfa78b3f2b16e43d15f9819e9430290af2"))
  51. --- 50 ----
  52. !         (       0, uint256("0x"))
  53. diff '--exclude-from=notthese' -bNr '--context=0' godcoin/src/init.cpp achilles/src/init.cpp
  54. *** godcoin/src/init.cpp    2014-07-27 14:24:36.038629925 +0100
  55. --- achilles/src/init.cpp   2014-07-27 14:26:27.382627441 +0100
  56. ***************
  57. *** 310 ****
  58. !         "  -port=<port>           " + _("Listen for connections on <port> (default: 12701 or testnet: 12721)") + "\n" +
  59. --- 310 ----
  60. !         "  -port=<port>           " + _("Listen for connections on <port> (default: 17256 or testnet: 12256)") + "\n" +
  61. ***************
  62. *** 353 ****
  63. !         "  -rpcport=<port>        " + _("Listen for JSON-RPC connections on <port> (default: 12700 or testnet: 12720)") + "\n" +
  64. --- 353 ----
  65. !         "  -rpcport=<port>        " + _("Listen for JSON-RPC connections on <port> (default: 17255 or testnet: 12255)") + "\n" +
  66. diff '--exclude-from=notthese' -bNr '--context=0' godcoin/src/main.cpp achilles/src/main.cpp
  67. *** godcoin/src/main.cpp    2014-07-27 14:24:36.022629926 +0100
  68. --- achilles/src/main.cpp   2014-07-27 14:26:27.358627442 +0100
  69. ***************
  70. *** 34 ****
  71. ! uint256 hashGenesisBlock("0x000000d33dc1866691d5a32ee21fcf8826958cfb40af3220f56c999414f258d5");
  72. --- 34 ----
  73. ! uint256 hashGenesisBlock("0x0000034e58835f5a592145ddb68adf4553513a5ca0ff02ddf51c0e2dcad59ca2");
  74. ***************
  75. *** 1090 ****
  76. !         nSubsidy = 10080*COIN;
  77. --- 1090 ----
  78. !         nSubsidy = 1100000*COIN;
  79. ***************
  80. *** 1092 ****
  81. !     else if(nHeight<=140)
  82. --- 1092 ----
  83. !     else if(nHeight>2)
  84. ***************
  85. *** 1094,1098 ****
  86. !         nSubsidy = 1 *COIN;
  87. !     }
  88. !     else if(nHeight>140)
  89. !     {
  90. !         nSubsidy = 7 *COIN;
  91. --- 1094 ----
  92. !         nSubsidy = 80 *COIN;
  93. ***************
  94. *** 1103,1104 ****
  95. ! static const int64 nTargetTimespan = 7 * 24 * 60 * 60; // Zencoin: 1 Day
  96. ! static const int64 nTargetSpacing = 10 * 60; // Zencoin: 10 Minutes
  97. --- 1099,1100 ----
  98. ! static const int64 nTargetTimespan = 2.5 * 60; // Zencoin: 2.5 minutes
  99. ! static const int64 nTargetSpacing = 2.5 * 60; // Zencoin: 2.5 Minutes
  100. ***************
  101. *** 3082 ****
  102. !         hashGenesisBlock = uint256("0x00000c4e5b62e04d9e78c357fbaacfcfa78b3f2b16e43d15f9819e9430290af2");
  103. --- 3078 ----
  104. !         hashGenesisBlock = uint256("0x0000034e58835f5a592145ddb68adf4553513a5ca0ff02ddf51c0e2dcad59ca2");
  105. ***************
  106. *** 3115 ****
  107. !         const char* pszTimestamp = " 20/5/14 Authorities have let The Malaysian Airlines flight MH370 disappear";
  108. --- 3111 ----
  109. !         const char* pszTimestamp = "Zencoin Zencoin";
  110. ***************
  111. *** 3120 ****
  112. !         txNew.vout[0].nValue = 7 * COIN;
  113. --- 3116 ----
  114. !         txNew.vout[0].nValue = 80 * COIN;
  115. ***************
  116. *** 3127 ****
  117. !         block.nTime    = 1403493000;
  118. --- 3123 ----
  119. !         block.nTime    = 1406102641;
  120. ***************
  121. *** 3129 ****
  122. !         block.nNonce   = 1586544;
  123. --- 3125 ----
  124. !         block.nNonce   = 1118322;
  125. ***************
  126. *** 3133,3134 ****
  127. !             block.nTime    = 1403414633;
  128. !             block.nNonce   = 590690;
  129. --- 3129,3130 ----
  130. !             block.nTime    = 1406102641;
  131. !             block.nNonce   = 1118322;
  132. ***************
  133. *** 3142 ****
  134. !         assert(block.hashMerkleRoot == uint256("0xedac2ffe17ec70f2433b92fafc72fabdb10446012bd00f4fc1c5e075edcba429"));
  135. --- 3138 ----
  136. !         assert(block.hashMerkleRoot == uint256("0xab476d4d52343e0c21e4bc570491214ab88e8ae373d2df7095dee9b6d4c0c792"));
  137. diff '--exclude-from=notthese' -bNr '--context=0' godcoin/src/main.h achilles/src/main.h
  138. *** godcoin/src/main.h  2014-07-27 14:24:36.018629926 +0100
  139. --- achilles/src/main.h 2014-07-27 14:30:36.694621878 +0100
  140. ***************
  141. *** 57 ****
  142. ! static const int64 MAX_MONEY = 21000000 * COIN;
  143. --- 57 ----
  144. ! static const int64 MAX_MONEY = 22000000 * COIN;
  145. ***************
  146. *** 626 ****
  147. !         return dPriority > COIN * 144 / 250; //144 blocks
  148. --- 626 ----
  149. !         return dPriority > COIN * 576 / 250; //144 blocks
  150. diff '--exclude-from=notthese' -bNr '--context=0' godcoin/src/net.cpp achilles/src/net.cpp
  151. *** godcoin/src/net.cpp 2014-07-27 14:24:36.026629926 +0100
  152. --- achilles/src/net.cpp    2014-07-27 14:26:27.362627441 +0100
  153. ***************
  154. *** 1196,1199 ****
  155. -     {"162.243.151.67", "162.243.151.67"},
  156. -     {"192.241.184.85", "192.241.184.85"},
  157. -     {"188.226.248.45", "188.226.248.45"},
  158. -     {"128.199.165.180", "128.199.165.180"},
  159. --- 1195 ----
  160. diff '--exclude-from=notthese' -bNr '--context=0' godcoin/src/protocol.h achilles/src/protocol.h
  161. *** godcoin/src/protocol.h  2014-07-27 14:24:36.030629926 +0100
  162. --- achilles/src/protocol.h 2014-07-27 14:26:27.374627441 +0100
  163. ***************
  164. *** 21 ****
  165. !     return testnet ? 12721 : 12701;
  166. --- 21 ----
  167. !     return testnet ? 12256 : 17256;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!