Skip to content
This repository was archived by the owner on Nov 5, 2023. It is now read-only.

Commit b48bdd8

Browse files
authored
Merge pull request #64 from helium/madninja/bump_core
Bump core to 2021.10.07.0
2 parents f565512 + e1eeeda commit b48bdd8

File tree

3 files changed

+21
-24
lines changed

3 files changed

+21
-24
lines changed

config/sys.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@
3232

3333
{honor_quick_sync, true},
3434
{quick_sync_mode, blessed_snapshot},
35-
{blessed_snapshot_block_height, 1012321},
35+
{blessed_snapshot_block_height, 1042561},
3636
{blessed_snapshot_block_hash,
37-
<<122, 101, 102, 177, 210, 83, 146, 231, 159, 202, 177, 154, 87, 46, 159, 42, 76, 115, 214,
38-
245, 137, 45, 180, 126, 229, 46, 196, 78, 208, 197, 186, 136>>},
37+
<<212, 78, 208, 77, 149, 141, 114, 253, 30, 95, 233, 18, 128, 246, 230, 144, 176, 72,
38+
162, 59, 180, 164, 195, 18, 72, 169, 72, 153, 183, 114, 159, 34>>},
39+
3940
{listen_addresses, ["/ip4/0.0.0.0/tcp/44158"]},
4041
{store_implicit_burns, true},
4142
{store_htlc_receipts, true},

rebar.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
{elli, "3.2.0"},
3333
{jsonrpc2, {git, "https://github.com/zuiderkwast/jsonrpc2-erlang.git", {branch, "master"}}},
3434
{clique, {git, "https://github.com/helium/clique.git", {branch, "develop"}}},
35-
{blockchain, {git, "https://github.com/helium/blockchain-core.git", {tag, "2021.09.27.0"}}}
35+
{blockchain, {git, "https://github.com/helium/blockchain-core.git", {tag, "2021.10.07.0"}}}
3636
]}.
3737

3838
{xref_checks, [

rebar.lock

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{<<"base64url">>,{pkg,<<"base64url">>,<<"1.0.1">>},0},
66
{<<"blockchain">>,
77
{git,"https://github.com/helium/blockchain-core.git",
8-
{ref,"c62d30552701d48eb347553766455151fa69926f"}},
8+
{ref,"e8a2485ad6b928cc4eb9b095980b2b55abc4e473"}},
99
0},
1010
{<<"chatterbox">>,
1111
{git,"https://github.com/andymck/chatterbox",
@@ -37,16 +37,12 @@
3737
{<<"enacl">>,{pkg,<<"enacl">>,<<"1.1.1">>},3},
3838
{<<"erbloom">>,
3939
{git,"https://github.com/Vagabond/erbloom",
40-
{ref,"a1768fa6a63e979017fe94ee86a86164e3c21d88"}},
40+
{ref,"8fc2a5aa2454bca3b57047c0b3f79f8d9d219483"}},
4141
2},
4242
{<<"erl_angry_purple_tiger">>,
4343
{git,"https://github.com/helium/erl_angry_purple_tiger.git",
4444
{ref,"c5476b6639314a75a99400c9dfa7603b24a6d18a"}},
4545
1},
46-
{<<"erl_angry_purple_tiger">>,
47-
{git,"https://github.com/helium/erl_angry_purple_tiger.git",
48-
{ref,"c5476b6639314a75a99400c9dfa7603b24a6d18a"}},
49-
1},
5046
{<<"erl_base58">>,{pkg,<<"erl_base58">>,<<"0.0.1">>},1},
5147
{<<"erlang_stats">>,
5248
{git,"https://github.com/helium/erlang-stats.git",
@@ -58,7 +54,7 @@
5854
1},
5955
{<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},2},
6056
{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
61-
{<<"gpb">>,{pkg,<<"gpb">>,<<"4.18.0">>},3},
57+
{<<"gpb">>,{pkg,<<"gpb">>,<<"4.19.1">>},3},
6258
{<<"gproc">>,{pkg,<<"gproc">>,<<"0.8.0">>},2},
6359
{<<"grpc_client">>,
6460
{git,"https://github.com/Bluehouse-Technology/grpc_client.git",
@@ -78,7 +74,7 @@
7874
1},
7975
{<<"helium_proto">>,
8076
{git,"https://github.com/helium/proto.git",
81-
{ref,"1c89c47647aee253a2d4ee178d4fb65e3349515f"}},
77+
{ref,"b25c996b1f58719c1dcf699ceacc25de0efba242"}},
8278
1},
8379
{<<"hpack">>,{pkg,<<"hpack_erl">>,<<"0.2.3">>},3},
8480
{<<"inert">>,{pkg,<<"inert">>,<<"1.0.2">>},3},
@@ -96,22 +92,22 @@
9692
{<<"lager">>,{pkg,<<"lager">>,<<"3.9.2">>},0},
9793
{<<"libp2p">>,
9894
{git,"https://github.com/helium/erlang-libp2p.git",
99-
{ref,"abc44d16f60ad29e9031b96b66707a355b58ba92"}},
95+
{ref,"b07508b7a3d348dbc268c4a63e998ec62d6c2419"}},
10096
1},
101-
{<<"libp2p_crypto">>,{pkg,<<"libp2p_crypto">>,<<"1.4.0">>},2},
97+
{<<"libp2p_crypto">>,{pkg,<<"libp2p_crypto">>,<<"1.4.1">>},2},
10298
{<<"merkerl">>,
10399
{git,"https://github.com/helium/merkerl.git",
104100
{ref,"26ddcaf7f3c2c76eebf6f9258822f923ce69cb75"}},
105101
1},
106102
{<<"multiaddr">>,{pkg,<<"multiaddr">>,<<"1.1.3">>},3},
107-
{<<"multihash">>,{pkg,<<"multihash">>,<<"2.0.3">>},3},
103+
{<<"multihash">>,{pkg,<<"multihash">>,<<"2.1.0">>},3},
108104
{<<"nat">>,
109105
{git,"https://github.com/benoitc/erlang-nat",
110106
{ref,"6136102c176814dd26c11b93ca0ce852b66c4195"}},
111107
2},
112108
{<<"observer_cli">>,{pkg,<<"observer_cli">>,<<"1.5.0">>},0},
113109
{<<"pbkdf2">>,{pkg,<<"pbkdf2">>,<<"2.0.0">>},0},
114-
{<<"procket">>,{pkg,<<"procket">>,<<"0.9.4">>},3},
110+
{<<"procket">>,{pkg,<<"procket">>,<<"0.9.5">>},3},
115111
{<<"ranch">>,{pkg,<<"ranch">>,<<"1.5.0">>},2},
116112
{<<"rand_compat">>,{pkg,<<"rand_compat">>,<<"0.0.3">>},3},
117113
{<<"recon">>,{pkg,<<"recon">>,<<"2.5.2">>},0},
@@ -147,20 +143,20 @@
147143
{<<"erl_base58">>, <<"37710854461D71DF338E73C65776302DB41C4BAB4674D2EC134ED7BCFC7B5552">>},
148144
{<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>},
149145
{<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
150-
{<<"gpb">>, <<"305548AD991583F4B9809E905D6A17475AB8DF85116CB3C1269FDA1E4424C7EA">>},
146+
{<<"gpb">>, <<"665F59680577038508A11CF6C932FCE26A4E35A19D586B912D763F292BC8E33B">>},
151147
{<<"gproc">>, <<"CEA02C578589C61E5341FCE149EA36CCEF236CC2ECAC8691FBA408E7EA77EC2F">>},
152148
{<<"hpack">>, <<"17670F83FF984AE6CD74B1C456EDDE906D27FF013740EE4D9EFAA4F1BF999633">>},
153149
{<<"inert">>, <<"A1905168232E4E1757E813C3D88719628A732EA4C9AE23598DD5981F70E91CAA">>},
154150
{<<"inet_cidr">>, <<"4814A5B78B969A5E069B0CECBB102622AB0C459B690053ED94543CD529915A43">>},
155151
{<<"intercept">>, <<"1F6C725E6FC070720643BD4D97EE53B1209365C80E520E1F5A1ACB36712A7EB5">>},
156152
{<<"jsone">>, <<"7EA1098FE004C4127320FE0E3CF6A951B01F82039FEAA56C322DC7E34DD59762">>},
157153
{<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>},
158-
{<<"libp2p_crypto">>, <<"58D2564A14C4DCC94B221C41B47FB64641A008D73CBE1BDAC43027DB347B34E9">>},
154+
{<<"libp2p_crypto">>, <<"CB93FE834A53059671C547957C1235C9426E5B7EE91D156AD5D90A9710BF4AF0">>},
159155
{<<"multiaddr">>, <<"978E58E28F6FACAF428C87AF933612B1E2F3F2775F1794EDA5E831A4EACD2984">>},
160-
{<<"multihash">>, <<"FC4ADD0368FF9955BEF8526B8B232745297E8FE3808277165EF29128116FD871">>},
156+
{<<"multihash">>, <<"F084F7C6BEC062F0C0E82AE18CFDC8DAEC8F4FAA4C8E1ACE0B9C676A9323162F">>},
161157
{<<"observer_cli">>, <<"9944882B71F55B2503663D9CB54D3F1C7BBDF7CC6DD01CC40EA8EF51207601EC">>},
162158
{<<"pbkdf2">>, <<"11C23279FDED5C0027AB3996CFAE77805521D7EF4BABDE2BD7EC04A9086CF499">>},
163-
{<<"procket">>, <<"1FC0D557ACC0145DD167C566C68F83B183E923016904DFE980534B3C9150E92B">>},
159+
{<<"procket">>, <<"CE91C00CB3F4D627FB3827F46CE68E6A969EA265DF1AFB349C300A07BE4BB16C">>},
164160
{<<"ranch">>, <<"F04166F456790FEE2AC1AA05A02745CC75783C2BFB26D39FAF6AEFC9A3D3A58A">>},
165161
{<<"rand_compat">>, <<"011646BC1F0B0C432FE101B816F25B9BBB74A085713CEE1DAFD2D62E9415EAD3">>},
166162
{<<"recon">>, <<"CBA53FA8DB83AD968C9A652E09C3ED7DDCC4DA434F27C3EAA9CA47FFB2B1FF03">>},
@@ -179,20 +175,20 @@
179175
{<<"erl_base58">>, <<"41E8EC356C5C5558A45682F61F80725789AE9A11BD1CC7D5C73CDE1E3B546DD2">>},
180176
{<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>},
181177
{<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
182-
{<<"gpb">>, <<"C2BB843866E627E1E0181C2F5E4B3EE79CBB8CD3574F66767E7F1D5130D6B025">>},
178+
{<<"gpb">>, <<"F6F4A7DCABD1723FDD3A3FD7C7EFEEA8146DA02B6F575E75BFC49F15FF4DB359">>},
183179
{<<"gproc">>, <<"580ADAFA56463B75263EF5A5DF4C86AF321F68694E7786CB057FD805D1E2A7DE">>},
184180
{<<"hpack">>, <<"06F580167C4B8B8A6429040DF36CC93BBA6D571FAEAEC1B28816523379CBB23A">>},
185181
{<<"inert">>, <<"540C01B83CAEB87664A96579AFBFB440C4DC7B780A7E808BA923E4550755C487">>},
186182
{<<"inet_cidr">>, <<"97046492E5C5BE0D8B92CD275980D667A8D28D9E79B2305828E358CC7D30A935">>},
187183
{<<"intercept">>, <<"FC5F5E26A571637B0B80119FE2F1E83DDDEAC8078BD76279C015474AF432B32E">>},
188184
{<<"jsone">>, <<"A6C1DF6081DF742068D2ED747A4FE8A7740C56421B53E02BC9D4907DD3502922">>},
189185
{<<"lager">>, <<"7F904D9E87A8CB7E66156ED31768D1C8E26EBA1D54F4BC85B1AA4AC1F6340C28">>},
190-
{<<"libp2p_crypto">>, <<"8D05C86C0BF4494440CE29DF13FAC6642F2FB6BF27976FB42DDAE35CB46C3BEE">>},
186+
{<<"libp2p_crypto">>, <<"A21C278896DA65E31A2C8FE767784F1493289CD956E172E7BA247EAB75207037">>},
191187
{<<"multiaddr">>, <<"980D3EA5EB0EB2EFC51E3D10953F17447D417C49BD2FCD7FC6A2A42D1F66D5EE">>},
192-
{<<"multihash">>, <<"E5AD0AEB48E195BB9546C3D49AD271D5F002469D9C70CF71BE0E50AE8E3EB03B">>},
188+
{<<"multihash">>, <<"E73AD5D0099DBFFB4EE429A78436B605AFE2530ED684AB36BB86733AB65707C8">>},
193189
{<<"observer_cli">>, <<"4D88A6CF3145AE4730CE979DC32634B6DF96363B51DEA15E20CE50B8160123E5">>},
194190
{<<"pbkdf2">>, <<"1E793CE6FDB0576613115714DEAE9DFC1D1537EABA74F07EFB36DE139774488D">>},
195-
{<<"procket">>, <<"647C2D1F5006370E457522ECC69509F1020D7D558F3D6E196825E1F4F3660218">>},
191+
{<<"procket">>, <<"1288BBA5EB6F08EA5DF3DDA9E051BDAC8F4B1E50ADCCA5CF4D726E825AD81BED">>},
196192
{<<"ranch">>, <<"86D40FC42AA47BCB6952DDF1DBFD3DA04B5BA69AFB65C322C99845913250B11F">>},
197193
{<<"rand_compat">>, <<"CDF7BE2B17308EC245B912C45FE55741F93B6E4F1A24BA6074F7137B0CC09BF4">>},
198194
{<<"recon">>, <<"2C7523C8DEE91DFF41F6B3D63CBA2BD49EB6D2FE5BF1EEC0DF7F87EB5E230E1C">>},

0 commit comments

Comments
 (0)