From 832f557e99c11e7e4a965230f229190a3e268559 Mon Sep 17 00:00:00 2001 From: Guilherme Lawless Date: Wed, 15 Jan 2020 17:42:19 +0000 Subject: [PATCH] Beta network reset #2 (#2476) * Delete rep_weights_beta.bin * New genesis * Change header_magic_number to one never used before --- nano/secure/common.cpp | 14 +++++++------- rep_weights_beta.bin | Bin 1024 -> 0 bytes 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 rep_weights_beta.bin diff --git a/nano/secure/common.cpp b/nano/secure/common.cpp index 22bf2a95..93952e4a 100644 --- a/nano/secure/common.cpp +++ b/nano/secure/common.cpp @@ -28,7 +28,7 @@ namespace { char const * test_private_key_data = "34F0A37AAD20F4A260F0A5B3CB3D7FB50673212263E58A380BC10474BB039CE4"; char const * test_public_key_data = "B0311EA55708D6A53C75CDBF88300259C6D018522FE3D4D0A242E431F9E8B6D0"; // xrb_3e3j5tkog48pnny9dmfzj1r16pg8t1e76dz5tmac6iq689wyjfpiij4txtdo -char const * beta_public_key_data = "A59A439B34662385D48F7FF9CA50030F889BAA9AC320EA5A85AAD777CF82B088"; // nano_3betagfmasj5iqcayzzssba185wamgobois1xbfadcpqgz9r7e6a1zwztn5o +char const * beta_public_key_data = "259A4394DB16B1FFE5568476655E844BA59E8EB5D222F20D42E50684D0C16B54"; // nano_1betagcfp7ojzzkof35peohaakx7mt9ddnj4ya8n7sa8imae4ttnm16dm753 char const * live_public_key_data = "E89208DD038FBB269987689621D52292AE9C35941A7484756ECCED92A65093BA"; // xrb_3t6k35gi95xu6tergt6p69ck76ogmitsa8mnijtpxm9fkcm736xtoncuohr3 char const * test_genesis_data = R"%%%({ "type": "open", @@ -41,11 +41,11 @@ char const * test_genesis_data = R"%%%({ char const * beta_genesis_data = R"%%%({ "type": "open", - "source": "A59A439B34662385D48F7FF9CA50030F889BAA9AC320EA5A85AAD777CF82B088", - "representative": "nano_3betagfmasj5iqcayzzssba185wamgobois1xbfadcpqgz9r7e6a1zwztn5o", - "account": "nano_3betagfmasj5iqcayzzssba185wamgobois1xbfadcpqgz9r7e6a1zwztn5o", - "work": "cb4efb49972c7106", - "signature": "C14ACC986C0561871B3382A93F5E64AFE55A3FA2EEE6892A7358DC817E2034AA56160CAA807A21EDFCFA528D034CD266F9ABFA4E2FF221D856255265BFDC0608" + "source": "259A4394DB16B1FFE5568476655E844BA59E8EB5D222F20D42E50684D0C16B54", + "representative": "nano_1betagcfp7ojzzkof35peohaakx7mt9ddnj4ya8n7sa8imae4ttnm16dm753", + "account": "nano_1betagcfp7ojzzkof35peohaakx7mt9ddnj4ya8n7sa8imae4ttnm16dm753", + "work": "7f5c2eb5e2658e81", + "signature": "DB9EFAC98A28EEA048E722F91C2A2720E1D8EF2A81453C80FC53B453180C0A264CE021D38D5B4540B1BBB0C378B80F2DF7389027593C08DDEF9F47934B9CF805" })%%%"; char const * live_genesis_data = R"%%%({ @@ -69,7 +69,7 @@ network (network_a), protocol (network_a), ledger (network), voting (network), n unsigned constexpr kdf_full_work = 64 * 1024; unsigned constexpr kdf_test_work = 8; kdf_work = network.is_test_network () ? kdf_test_work : kdf_full_work; - header_magic_number = network.is_test_network () ? std::array{ { 'R', 'A' } } : network.is_beta_network () ? std::array{ { 'N', 'B' } } : std::array{ { 'R', 'C' } }; + header_magic_number = network.is_test_network () ? std::array{ { 'R', 'A' } } : network.is_beta_network () ? std::array{ { 'N', 'D' } } : std::array{ { 'R', 'C' } }; } nano::protocol_constants::protocol_constants (nano::nano_networks network_a) diff --git a/rep_weights_beta.bin b/rep_weights_beta.bin deleted file mode 100644 index a76b59a2052e2d1fd5ec519cc56acabfddfc3b47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmZQzKmvC=(p6_U2tGS?k!{xW13EVHTC0rqaN6`Xy%RS1X})A%gFzubuVZXn_IU|q z20j_di(lre&T_vO+3H>{I$yl;_+OX%?4{{)0a_c*-#&fFTtdlEoS$<>H;2ad-dlEg z&-4HP5#K5uY@*9F<=DwL3Ljb%nkH$-eel0~BqBO#kL3D2n`7T`Cka=y@9M2?I<5G$ z{{R2~iPM&b9gMq@lpk{St$WCmhrjOJo@7+ecQ^Gk*DGhSY;Vqg@o@({q=f!QpZ&Se zP&?>3$A`-DBMYJHv9D{7tHYYS>wlt0b-*SufMI;A#OdsJ3%V zye+hgc)$VWI4-%g(V%jNWuRJBst75DF?F}1QnUyjREKCmW*4*fM0jOSEhRv|+ zQp-Q{&*v|$z4-KsfS|Ph6Z!3jSdOUqK3pc#4pbkjSaPh{Wy|6C2|)Em=b2?hrRTAo zO;|f!jL$Tt=8gD+i-Fg;i>L0^-fyh5i;0~>B=pg~->c>KJz8|s<3OQ=i}bgNJHF2k zd|#X9$HnpMrh!^thTER6b5^Ziud;Uo6RR}WbW?Nd;zFx>ivgS zlXI1Q=E1!o60Zf=Z?zYzM%5=)Gch`Rm%OFEo26WMJ4pSdy_O%V7Nzj|9qD{Cb$hO# zR_uwLYgV1yH237rFSowmsY6%4Si)7jbmEsC2j7J@G&@v&TbR3eVvNG8bxS;Lb@li5 zC84YLlDaIX_?+|EyuLdOSKL$zA6&ECpD|U^rqS|ytA4-&Lv-~@9+Q(fydL&Chs{5o zn!CSjk>c%;==`mT`;B)7ZCYvB095}i{C8k$|4i0`13>p5ue`AF;iWlm#I_%(R5|ln zsrmBEty^*gpPXmvH@|=Ve=bn{tE#nKul6yio_PRNzwp46SBfXETG{BXw#`pnv5cu& zt6_1_>#%cY*VfElXW4?TK56B;IX_-Xd+_YMB2csM@i9w@a$Wl!+uAQ};^CbW$;r>e zXqVTdT4F1+^SZ%O4F-lJt|>Y;XM6swzH0GtPVUT~JU1&fPg$NeUGqe@O+nJnoFTSh zw^i&V?PH8wMtM6J7>YJtR!Oj2Yr3{6f7+hIYW>g8cg|D2rx7T4TsdElxyG8oTsJ;4 zt9O^Jgn8Nqp!-*bM%!f_xO$?seZuWeHlOx=y!dvC#Pq(V*l8^Lr|q!6%wQbseTTo! N^6X!!dFz4c9{||O&F26B