Skip to content

Commit 4b96cd6

Browse files
committed
wip
1 parent 53b65b0 commit 4b96cd6

17 files changed

+580
-439
lines changed

src/CryptoNoteConfig.h

+23-152
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ namespace cn
141141
const char P2P_NET_DATA_FILENAME[] = "p2pstate.bin";
142142
const char CRYPTONOTE_BLOCKCHAIN_INDICES_FILENAME[] = "blockchainindices.dat";
143143
const char MINER_CONFIG_FILE_NAME[] = "miner_conf.json";
144+
const char CRYPTONOTE_CHECKPOINT_FILENAME[] = "checkpoint.dat";
144145

145146
} // namespace parameters
146147

@@ -185,12 +186,13 @@ namespace cn
185186
and the minimum version for communication between nodes */
186187
const uint8_t P2P_VERSION_1 = 1;
187188
const uint8_t P2P_VERSION_2 = 2;
188-
const uint8_t P2P_CURRENT_VERSION = 1;
189+
const uint8_t P2P_CURRENT_VERSION = 2;
189190
const uint8_t P2P_MINIMUM_VERSION = 1;
190191
const uint8_t P2P_UPGRADE_WINDOW = 2;
191192

192193
// This defines the minimum P2P version required for lite blocks propogation
193-
const uint8_t P2P_LITE_BLOCKS_PROPOGATION_VERSION = 3;
194+
const uint8_t P2P_LITE_BLOCKS_PROPOGATION_VERSION = 2;
195+
const uint8_t P2P_CHECKPOINT_LIST_VERSION = 2;
194196

195197
const size_t P2P_LOCAL_WHITE_PEERLIST_LIMIT = 1000;
196198
const size_t P2P_LOCAL_GRAY_PEERLIST_LIMIT = 5000;
@@ -206,6 +208,7 @@ namespace cn
206208
const uint32_t P2P_DEFAULT_PING_CONNECTION_TIMEOUT = 2000; // 2 seconds
207209
const uint64_t P2P_DEFAULT_INVOKE_TIMEOUT = 60 * 2 * 1000; // 2 minutes
208210
const size_t P2P_DEFAULT_HANDSHAKE_INVOKE_TIMEOUT = 5000; // 5 seconds
211+
const size_t P2P_CHECKPOINT_LIST_RE_REQUEST = 300; // 5 minutes
209212
const char P2P_STAT_TRUSTED_PUB_KEY[] = "f7061e9a5f0d30549afde49c9bfbaa52ac60afdc46304642b460a9ea34bf7a4e";
210213

211214
// Seed Nodes
@@ -230,160 +233,28 @@ namespace cn
230233
__attribute__((unused))
231234
#endif
232235

236+
const char DNS_CHECKPOINT_DOMAIN[] = "checkpoints.conceal.id";
237+
const char TESTNET_DNS_CHECKPOINT_DOMAIN[] = "testpoints.conceal.gq";
238+
233239
// Blockchain Checkpoints:
234240
// {<block height>, "<block hash>"},
235241
const std::initializer_list<CheckpointData>
236242
CHECKPOINTS = {
237-
{0, "b9dc432e56e37b52771970ce014dd23fda517cfd4fc5a9b296f1954b7d4505de"},
238-
{10000, "55cf271a5c97785fb35fea7ed177cb75f47c18688bd86fc01ae66508878029d6"},
239-
{20000, "52533de7f1596154c6954530ae8331fe4f92e92d476f097c6d7d20ebab1c2748"},
240-
{30000, "50b5d84ac0b8abfe25669aac8514505c4c5f7ffd8e2bba0b52ab64f600d90796"},
241-
{40000, "ae2ed29163a57396f11c743400e55fba3f6b8e6bb6473f421c48ff8c87447ad0"},
242-
{50000, "8ad7969ca5d3cf48f784d33b60d1ea00bfb35b632447584e5181b194f3bb9cd6"},
243-
{60000, "22b1a161de2318b1a83ae0e3d1d04a2c420accccadd861aa8ad6365ec630ce04"},
244-
{70000, "4ef8a3c59b04ad8ae335fee0b5df0c1b114dda57d13232741d82c4984bf22bed"},
245-
{80000, "a60bd6b446c5b09997b5b70f31c56f35358657a673dcf56213a163fb6516750d"},
246-
{90000, "9985f631d4b2c15388e8c3797a1384b4610b13ff3852bc6d8f125ea4e13fdd22"},
247-
{100000, "1ccef60fb31646fc1745ccb42167f2e2efcf953a83b99ff4b6a39c99eb37d0e5"},
248-
{110000, "1b80bf8355ea023de7ed3367881ef111dfdb3aaeb25db3a0d6cad4c3cc0bb4bd"},
249-
{120000, "f621bd615716b75716eb89714d60481077a16b1df4046bf829f6d09b1c8e58a6"},
250-
{130000, "deb2514d03e2faf1c63b55f707b1524665ca4bd71cace3f4e8f0de58f32ecc41"},
251-
{140000, "c439524c13187bb6008acb1e9999317aa44e8d1cd75c96faae78831f6b961bac"},
252-
{150000, "90cc70379ea81d47df998e8b9928ba9191968035ae79ec1cb429c64a55497e03"},
253-
{160000, "4176bdff06416934d7766a6c2f6279d048cfdc516019a0580ea19c1d003038cc"},
254-
{170000, "50e3af756e96115011c8e4d138852e1f4835da805ca5ccd826f81593a53f4bd3"},
255-
{180000, "e1672173a2794245830a742d1df38b5fe5006fe6f00707e1b776bf29316ab18b"},
256-
{190000, "763eaa3c049ef46479144924b41cc9cb37346da88b0a3ae32a10e026c6f7984c"},
257-
{200000, "2ef304bec067c3a94f04440a593a13903a1487890493d15f74ec79c0ae585109"},
258-
{210000, "90dd7aca026ec5f9fdfd2fa9cd0c114c1c6c6bfc0536fb6490c804ac7ef72425"},
259-
{220000, "8de5278fc6703933e32e062b14496b0e1562c941e7e3c5b93147a3b39491fac5"},
260-
{230000, "f8ed2680d912a7f3aeb452d4eb8023f93f6387ff4c6927615691f66701d05d32"},
261-
{240000, "4445874d16b3dd8d5b0f9dee287e47219022c2b214c459e03be2bb71e4a12e3d"},
262-
{250000, "c579d2ad4f95a6c34180a89b32aa9fbe6ab2ecba9f3714ddde90fd5d9f85f6e9"},
263-
{260000, "ce63d00de7546f1dee417b2391692b367dc5c2cfe19ea43c98cf932d3838c5ec"},
264-
{270000, "f16000fefb54ad1f0f927f634c5b6f44fcfa201adc5ee093850301bd773c18fa"},
265-
{280000, "aba16466e085b2c7a792ba449f025bd1e37d6a1d44fa957a1ad4df78f41f6478"},
266-
{290000, "9fd5f13ac51df7ce2b8d78c45fbb864b231d6275bf7495118b4cc415301e6fe1"},
267-
{290665, "4e0082f3e66b0fe4176a850ff9560f1d8d2f2e11dc3a2045904209d11478f779"},
268-
{290674, "ac89a1f4c20674a8d735681b1ded3a1242252bb23341bc9b79bc06b310b490f4"},
269-
{290675, "6782c5e7436f77f4466253d6a70466cc6bfc66c6c51b675864c4543250c09e8b"},
270-
{290676, "0b25026f8c7fb194776c081f2bb32874b82f4298bd0d71c2d0a986117b97fa1e"},
271-
{290720, "36572a88fbed4654f4291f6d7a35a732b81f61e87ec27ce58f38047981b84e09"},
272-
{300000, "2a984212cc42ef62cd2229b624e05aa72926f0e89006e976c88b52d99ea14225"},
273-
{305000, "46104ab66387ab6ca6a3889e81c7b9810e27f547a8684659aeb62c438a3b6cf0"},
274-
{310000, "4a896f5de4f782c59f1f4691505aba0df87a20f2e06499b59496b8d7ffb025fe"},
275-
{320000, "c68d15c181bdfc6c5b7fe5c46c6432a03b95d640caa425a5cb3aa675c1d8f8fd"},
276-
{330000, "af9e972f98bed57579a6691c3d21443d3cbff35005e984044bc99cee82d93922"},
277-
{340000, "6fce13dd473f3673cd08b28171902e281d7fdbbd8b8ba34e0019ae18f597d22f"},
278-
{350000, "f08aad1562ceee3a6c8147846bb3e5dd15b3168007f588ab68bd8ee816eb386d"},
279-
{360000, "cd910715be7dccc155ad3e8a6311f1bbcfaffe3ee25186c454ed27ee61faa977"},
280-
{370000, "6c4a86be9a1f697cadc38d21718803c43f49bf60c71ae253293e29ebac6efe31"},
281-
{380000, "620709892437c28deb72a56e6a91960f481aa682d8dd8652f792fb33e6683ef5"},
282-
{390000, "d2ff4c39b4aed7ef08a99a00b9823bed44581e866180ae3daa8b8e990b57ec63"},
283-
{400000, "9b7302daf5e5933b9a3e75a12651eaad83bea7d0058191cf65eb20985fe281c5"},
284-
{410000, "4f343219e57f78c1063f4b4c5be6cb5a10599d64d36e9f686f7046469a6c7e73"},
285-
{420000, "56b2fec8f7a55c9e2960d7224999c2e8c83a77f051931ba1673e071e7bcd6851"},
286-
{430000, "6d6e24f6c518c9cc24a05967fd1bbb3aeffb670fd7329d0a24053662a2305d9e"},
287-
{440000, "6a0138801d48150985045bc671c752f8209d084adad3624a57edd22f9edbef78"},
288-
{460000, "dec1da5df01c3cdf5d25a577816c93de58dfb6dd6b073619c5cbd50aedefceb7"},
289-
{470000, "1d07fd8995e17429143202da00138f0bfcbdd20aa5ddbba18ac762bc473ffd77"},
290-
{480000, "c896df9146e8f09f6205496dfa1e28037c8223f531546d2d64119068a6d1db1d"},
291-
{490000, "faa86e0b546f7655e829dcd8e967a52d9fa933c832863a648df30cc0e8771fa8"},
292-
{500000, "df5b2b47960ecd7809f037de44c6817640283e13323a36fe3dd894f3b2b3c5e1"},
293-
{510000, "db784d782ac463fbfbf221b417166a80ca1451f8895a1e3027bd19de2952c9bc"},
294-
{520000, "70b9c6945d8156d97d5f337b22ec8a4f77fa8af3b89d63e3fe6b834a03f7a613"},
295-
{530000, "f1b6f4018201e9c498e2b441f8e20f6e562e5d45c69008fe74caa7baa0a16611"},
296-
{550000, "1b922d13de891cd9f7224bd1a3c879a1d7634505f5f562623d7a487d44211327"},
297-
{570000, "9efe8868099afd1f6b17de773da0f5baebf2ace666bf5e599188c64d27cd429f"},
298-
{580000, "39ecee8d292c4e0440467b28ead6ed96c480ac85bec4fdba1e4c14b49b08077e"},
299-
{590000, "d6201b072cfed013b0e1091517624ca72bdd1ef147143356a1f951dd3241dd88"},
300-
{600000, "9f87dd161e37e9dbbcd86a3fafe8e1dec8c54194251ca0c36c646173db12c115"},
301-
{610000, "9c95678a27c5bde2b53efdae5c20a5528f134c4ff75737dee3e3d63b4d79c7ba"},
302-
{620000, "e5de278b0ea676855873663a32a2d21bc6d98cffcb133e249c8219fb0fcdc3eb"},
303-
{630000, "762c8269af35d53408d806d453b8ca6f19fc9e83048bb8d985502344f1d5e08a"},
304-
{640000, "24e1ac8aff3e1e7850c06a377c68b2ea3afe53477b710b988b6b456383a50081"},
305-
{650000, "4587f3196487cdf12e701bebe30340669374e39b6e0ca7a3c32d6b522be44570"},
306-
{660000, "8d8338dab606e4010f1fa53bc0ef268c98f63bf727150184bfedbea37c40026d"},
307-
{670000, "26350d735576a40e4d4e628b57186f4c7f85b3bea6c15f28554706f4c78c3837"},
308-
{680000, "6774c21beb0f4e2383069da967654ce4d26743f313aa7c705f222c055fcf0e05"},
309-
{690000, "33e1ddd732edfb8e850cdca304ae398a2eb495fd2a6876ff759725788f5b1135"},
310-
{700000, "a6b8e9707cd5ac93931b3fcc6bb516d11e7cb840bf49c8d3712bdeba605557be"},
311-
{710000, "922f1ca029163e58a24d6573e7de6bf9bcecc16ae164ebfd0285c0eda57d4eec"},
312-
{750000, "0e22dabd4379040815f078525ed02ae95e26ae92bc9eb35628a5d588e176b900"},
313-
{760000, "ecc64815b44b4c0c67340ff7e0d9fefee2cfbfbed10d61260c49bbe98aeb6ea2"},
314-
{770000, "7c97512a8ffdefa3e97809779841e48ffa6b68bd8a5bf90fcb59c1547f5ad90f"},
315-
{780000, "7acd1d5c843245bf1cc12a966f388111e2258c029595d31539b9257bb1217e61"},
316-
{790000, "580580b3b628b68532d9b141cc5e3299ebdc6e421c58ed155916c418144704ff"},
317-
{800000, "bb0dc113b1bfde3f06bfa341ba7d6de6ea82cebc86b98fc3d122b695e0bfdebe"},
318-
{810000, "c8a8e81032d66b137a99087ddd6ca6289040cb336012d4248ff616e1e7abb5b3"},
319-
{820000, "98a8373323adca6f09048177c774783150bcf25b62e26c804fd33461fc1af09b"},
320-
{830000, "7007d4331703233f48a3f1a2e824734d02ec81e7da46b7e00a2c354edb8de357"},
321-
{840000, "eae669f44a964ce5501b971139ee04657b62dc2535e9305857a1c9e2e839790a"},
322-
{850000, "e354bf503e8273a90d5d338ce78966ee820b69490b3a3183f0765281429d2f77"},
323-
{860000, "11b35a3f0c78686d75991d5bf65e868e565ea4ba15e96c9b0f643a4d9983eedf"},
324-
{870000, "21fef5a9cbb6ebe8ba271bdb55ed4d3ccd0468ab31a77f634cabc893e2a9661e"},
325-
{880000, "a861367503fec46c12f8ae957438a389c4de7b3c267cfdb21a7be29337885e10"},
326-
{890000, "092b29ab3369d0227239f0604d57ab91a3e1794ca3abe0c75fd5e69acb611a66"},
327-
{900000, "4cb49bba6abe10464db1075ed7125172e639ec9ee03f08ddb4dbed318d9dbfb9"},
328-
{910000, "2b3064cc74a3780e55c6eba250ec1e6ad6deb7ea6188430c07ba6fb3b60b63f0"},
329-
{920000, "961be71463b51c41fa5fbd43213b43b4b66173c26c1cd29d55881aae29a8ce07"},
330-
{930000, "511d2784b65e9ff0da55358834b88319b653aa1b5bf5a0f76c25c0467c16c536"},
331-
{940000, "781dba46e6a2d8a7ba4129e32e7764c519e011d8967672f7873599eb5449f760"},
332-
{950000, "5404a8e358ddf55c018bff01f4c112fc5ea291ac4429524d8b5c496ede697246"},
333-
{960000, "5133cf16ece3cba43a199c11dc80ecd81a8dbda4ce0c517f78a3e400efa6a730"},
334-
{970000, "e9ae491f24acd824dbcd43178c3070878e0ec32b494fe293b153fd19b2e8428a"},
335-
{980000, "c99c74ae4e3ff43ba2c93cd8a6d3ed52598c7bda6b42fac18d9569e29c5753aa"},
336-
{990000, "0412793a1650aeba2cf9ab7c32bee26668e8e997a55e97d65c609e903f9e04ec"},
337-
{1000000, "6ad9d4ccc9666b31481079374e573c20ebdf2d63862da8fcc2c45d13093b93ba"},
338-
{1010000, "f341d678cfbd5d488bbc179bc54fc92587dad7fb29823facc95f3e26158a722d"},
339-
{1020000, "e3dae82d451358ac300e3960695784efb7d76833e620d75196cd0af9db0568bb"},
340-
{1030000, "4d1d4f3174e684c93cb3dc0e261776224b02f6c0bd2c7ea91b6f923b42e7b321"},
341-
{1040000, "c894d5f5a6637d7ec50c9a09722059aa5e878bf1eda7210a1f6c4e61eca770ef"},
342-
{1050000, "8a0f5df47ce13a082423743651f22209cef78f46b933ced7642d1f6b8d8d80be"},
343-
{1060000, "59d6ee913234a03eefa023a3a12487c5244973e17a9c9dcc61bd7cb3c5dcc426"},
344-
{1070000, "0895514f95977bdbb220550f00ec38962a6e672a125dad115f2408600fd9b593"},
345-
{1080000, "58a71c6f06c16e3337f5dd43a018d2768b2f6ca2d97a7bee9e81b2b2bae866c3"},
346-
{1090000, "2c268f5a834ac104b04991b8b131205468ed06cd6a5acdadffa05db82394f113"},
347-
{1100000, "8b87b5d9941cf9b46ceaff134cff5bd8a9d0326bb045e8abcaa1eb63fda739bd"},
348-
{1110000, "2215193bc9e56654777e40c4d62c7b89f48e8d14b62335a800034bd5bed12835"},
349-
{1120000, "35a3baaaf080bd2e8321a0344fc939fbeca147f6078bc3c807cc3eec23325f96"},
350-
{1130000, "ea86d90d85c8b56edd03365d8558acb84dc3f33764a32df426eaf20b7d5b9d71"},
351-
{1140000, "611dd25b2ec9cc5a630e5aee561921efc13c939f179507f7a08afceb13f5035f"},
352-
{1150000, "122a7bf817cddd406a016304b35991f6f2a5cdd122cdc1b5a54fdd4e012066ae"},
353-
{1160000, "85b4997808f2c21ba7f94baa97de19bf1dc809fcd40936bf1fcaaca191ae1466"},
354-
{1170000, "7675f0144db2ae5f6e0c378a25778850c9fd6facd285e89cdfc4169f19bb79d2"},
355-
{1180000, "4f9c52d49f270df62ddf2b45f7e616321b686d6204e3c67f8807129ff180cdfb"},
356-
{1190000, "8b6fd535bec46f3b28772e82e210fd1988b1b4704801b75712c6af17b9a09a2b"},
357-
{1200000, "9434fdddd2e7521fa92aea42f11a30d364ccc413074993b2aacb31987cca02da"},
358-
{1210000, "d424b084320d8c138dca36de8bb2dba40e142f9fe6785f50b39c80543a653c4e"},
359-
{1220000, "9dad391d2c819b482d9a9408db63e480726597f21d180f9a590f3c20f2c9fbc8"},
360-
{1230000, "3c0fda332a0a1d0d9329087430960fd6506f7d01cf14cd027567074c3c9b79ef"},
361-
{1240000, "00a5a0b11c0f20fd30e98881dcf7c2246a67aea8529c71400f3bae4658214ce2"},
362-
{1250000, "786f2af5d5ff526cfb0330baed655d2a7bafbe5bcafa10759b17d6cd9cf9ee1c"},
363-
{1260000, "0aded508302e4987d6a585990e2b1f27b81582dd0ccff3fc40ca0779daaa7da1"},
364-
{1270000, "0b8a495699b85eae4e115b84259b056d9084025a0e9b11b67cca1c47552f0998"},
365-
{1280000, "544b164dfc4e19221e23e427fe821c812dda2a41fe5eee1915065f99a3c707d2"},
366-
{1290000, "7844314fdd7e70ed38def90377339e249108e328bb94820f070c6aa2a787abf9"},
367-
{1300000, "68e1ce32210bc1cd41ea26e64382f39c5302bf251273cc6fd35d80a3c19df815"},
368-
{1310000, "64aab7bbc148131f11479e74bbbd74c67e6ee45312bd6e72f5b68d5d1d383e46"},
369-
{1320000, "1e3d88026216db2a09b7771f5c36b6a9cf49086d259160b2ad4530155265c394"},
370-
{1330000, "2c05b06c4412738a06961406cea1d3b605afd0380a29ff306db6f1b820ce802f"},
371-
{1340000, "271352a6b9d8cdef191aaf3395d5b38d7e7bd1b270766aceec915d0e5d6eb9c4"},
372-
{1350000, "2911699e718b064a4820a860bff5b421ee122707cd4cc7bacebfcb70ed4ea8a5"},
373-
{1360000, "2635c819e25ea4d25be05adf7b515c09b14ff0bffd600921ab488d8597e1e35e"},
374-
{1370000, "a8e01900ca2289971a6f926c9bbd420a86c9213c287b8c207c4ee5accff27f10"},
375-
{1380000, "d6014404b60a7fd16372aacefb78132d417d8e08b5a6876851ab4862b167c84a"},
376-
{1390000, "30c3eb1c67b1ff52e84c7637131f6e0a950464c633e6e69bb27be7488a690462"},
377-
{1400000, "9668035887ed9f819382db025f852e57aa02fa8980b4c9043f0dd535ea4a1085"},
378-
{1410000, "a01f353bfe5b907f9b0ffa7e4226caca5d8a67e2bf4b39c13c93b63a4a7d4379"},
379-
{1420000, "930ad5850a8aeeb8ee38b08006bfea2e93474d97bf666b97df9ab9fbe84a79be"},
380-
{1430000, "8d1b006f9fa277196f62a98a501ecf91a81731d199463c23931181b4a28b694a"},
381-
{1440000, "b54921b7c396e66e1a15492289e33993a166f49675739f437257fbb760ee1035"},
382-
{1450000, "f8a2b95f394f6cd188363a20f585dadbfa0db707dd5fa2699604eb7ccab313a6"},
383-
{1460000, "6bd96b76bd2d3bc7ca320c089ffe21e64565432401cb94736d60d8f70cfb42f3"},
384-
{1470000, "7e2d26dd0b258ff826d6ff1e36fe6606206fca535ba0ed40e944ddb165da9dc0"},
385-
{1480000, "f4463eed0890245dca0ccf9fb3a9f101e110f1dc53ce1286ef47d56938faf007"},
386-
{1490000, "bc76acf39ea16ce02588798b93034208881bab6c6dd9dfc545a6fab51dfce886"}
243+
{ 100000, "9b58762e759cd02cef493b310f95d73c36a907ea5c6ab3953b6b304651d3f291"},
244+
{ 200000, "07a7d796f64309b84558b7fc44902dd65dbf1bfd4b727b9f48b9f358b9c7e4f5"},
245+
{ 300000, "d723e8964fd416d1fbb5c8d616b0f7aa2f61cd7dbf1c7f6654daf751915f7967"},
246+
{ 400000, "1b4fbfd19b8502af420b8a38a6ac610a6b9e30a164af4da742092bdf9887d086"},
247+
{ 500000, "47cce8323f661b07048be52a2c6cca29f9f49aa5cc3282253f6e0a54dd3f1d56"},
248+
{ 600000, "086035e107dd22b8be63a86c28f750124306914cd47f46d0c69208580a4d5f9e"},
249+
{ 700000, "b499559416d7198a01bfe6c02d94f0e0c4ff785158ffa6f690e736317372acc3"},
250+
{ 800000, "3c5207312c528b80df4392f5f6a99cb23457d018c08747b072e7ab86a83025b4"},
251+
{ 900000, "4bb3c7c5b7bd24dac9440f3f5797348716b1b1a6335a0de0769f0ea0f409e447"},
252+
{1000000, "3148b677584d71f5e75b5c7431d525aa6b8d8a7d5e4d01ea4adadc75adcc64d5"},
253+
{1100000, "480f890918c2c550696109391b55ca465fdc04a4302b403a90ccf00c37a282d9"},
254+
{1200000, "f730a854601d55c774755a6d8f561ab2454dfb763340f23b7218c24ae14163f4"},
255+
{1300000, "d130491c88398a2812849d27fa09b884085d7f2feffe5d5da0f56cd8039469f5"},
256+
{1400000, "570682ba6a7614081071a9f111b7e737789e1c7d445635bcd1f830211a311a19"},
257+
{1500000, "43f173aba14a6b2d023c07796683789470395d7f15ebd24991617b4cc81c4f8c"}
387258
};
388259

389260
const std::initializer_list<CheckpointData> TESTNET_CHECKPOINTS = {

0 commit comments

Comments
 (0)