target fixes and dep bump

helium · Mar 15, 2022 · 62a89db · 62a89db
1 parent e60d861
commit 62a89db
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/rebar.lock b/rebar.lock
@@ -5,8 +5,9 @@
  {<<"base64url">>,{pkg,<<"base64url">>,<<"1.0.1">>},1},
  {<<"blockchain">>,
   {git,"https://github.com/helium/blockchain-core.git",
-       {ref,"1d2bd57b95923b939d51cf044a8472f912ca14ac"}},
+       {ref,"0e772f1e2369d52fbb75ebe628f8e590a9c85ccc"}},
   0},
+ {<<"certifi">>,{pkg,<<"certifi">>,<<"2.8.0">>},2},
  {<<"chatterbox">>,
   {git,"https://github.com/andymck/chatterbox",
        {ref,"b56a2a08b8a31b7ab0d536e5e8a55d5abe70390f"}},
@@ -99,19 +100,21 @@
   {git,"https://github.com/helium/erlang-h3.git",
        {ref,"90e1b6ebf93f88702ce8d24d9142833a8401e3ab"}},
   1},
+ {<<"hackney">>,{pkg,<<"hackney">>,<<"1.18.0">>},1},
  {<<"hbbft">>,
   {git,"https://github.com/helium/erlang-hbbft.git",
        {ref,"f4b8137fd4ac3a54dcaf21ba44856f77b8c97814"}},
   0},
  {<<"helium_proto">>,
   {git,"https://github.com/helium/proto.git",
-       {ref,"ed07837e11a6d0c9881022d936298c753011eac5"}},
+       {ref,"53b7574d4fd8ae03c153467e0d24f2a040d46394"}},
   1},
  {<<"hpack">>,{pkg,<<"hpack_erl">>,<<"0.2.3">>},3},
  {<<"http2_client">>,
   {git,"https://github.com/Bluehouse-Technology/http2_client",
        {ref,"8a6faf3ef1e0f3bb480d52d34ef5181258e99302"}},
   0},
+ {<<"idna">>,{pkg,<<"idna">>,<<"6.1.1">>},2},
  {<<"inert">>,{pkg,<<"inert">>,<<"1.0.4">>},3},
  {<<"inet_cidr">>,{pkg,<<"erl_cidr">>,<<"1.0.2">>},3},
  {<<"inet_ext">>,
@@ -148,12 +151,15 @@
   {git,"https://github.com/helium/merkerl.git",
        {ref,"26ddcaf7f3c2c76eebf6f9258822f923ce69cb75"}},
   1},
+ {<<"metrics">>,{pkg,<<"metrics">>,<<"1.0.1">>},2},
+ {<<"mimerl">>,{pkg,<<"mimerl">>,<<"1.2.0">>},2},
  {<<"multiaddr">>,{pkg,<<"multiaddr">>,<<"1.1.3">>},3},
  {<<"multihash">>,{pkg,<<"multihash">>,<<"2.1.0">>},3},
  {<<"nat">>,
   {git,"https://github.com/benoitc/erlang-nat",
        {ref,"6136102c176814dd26c11b93ca0ce852b66c4195"}},
   2},
+ {<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.1">>},2},
  {<<"procket">>,{pkg,<<"procket">>,<<"0.9.6">>},3},
  {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.8.1">>},2},
  {<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},3},
@@ -170,12 +176,14 @@
   3},
  {<<"sibyl">>,
   {git,"https://github.com/helium/sibyl.git",
-       {ref,"e1227336e4aa919d1beb081e06d683c627664d54"}},
+       {ref,"e9a4f20a2cb3f5ee50ab7e0fd88ce71162d2b3ef"}},
   0},
  {<<"sidejob">>,{pkg,<<"sidejob">>,<<"2.1.0">>},2},
  {<<"small_ints">>,{pkg,<<"small_ints">>,<<"0.1.0">>},4},
  {<<"splicer">>,{pkg,<<"splicer">>,<<"0.5.5">>},2},
+ {<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},2},
  {<<"throttle">>,{pkg,<<"lambda_throttle">>,<<"0.2.0">>},2},
+ {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},2},
  {<<"vincenty">>,
   {git,"https://github.com/helium/vincenty",
        {ref,"e33268c2a497f218d65e068ccec42e59ff5be996"}},
@@ -194,6 +202,7 @@
  {<<"backoff">>, <<"83B72ED2108BA1EE8F7D1C22E0B4A00CFE3593A67DBC792799E8CCE9F42F796B">>},
  {<<"base32">>, <<"044F6DC95709727CA2176F3E97A41DDAA76B5BC690D3536908618C0CB32616A2">>},
  {<<"base64url">>, <<"F8C7F2DA04CA9A5D0F5F50258F055E1D699F0E8BF4CFDB30B750865368403CF6">>},
+ {<<"certifi">>, <<"D4FB0A6BB20B7C9C3643E22507E42F356AC090A1DCEA9AB99E27E0376D695EBA">>},
  {<<"ctx">>, <<"8FF88B70E6400C4DF90142E7F130625B82086077A45364A78D208ED3ED53C7FE">>},
  {<<"ecc_compact">>, <<"D45197DB76EEBD22B144552795C1950DD07B013D591EA2C3A8DE22F8EE6C132B">>},
  {<<"elli">>, <<"089218762A7FF3D20AE81C8E911BD0F73EE4EE0ED85454226D1FC6B4FFF3B4F6">>},
@@ -202,13 +211,18 @@
  {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
  {<<"gpb">>, <<"E841A1C5D5B82B6FBADDD2B6968C66AD48B34ADC3B0D974E55CCA653BD28CCC5">>},
  {<<"gproc">>, <<"CEA02C578589C61E5341FCE149EA36CCEF236CC2ECAC8691FBA408E7EA77EC2F">>},
+ {<<"hackney">>, <<"C4443D960BB9FBA6D01161D01CD81173089686717D9490E5D3606644C48D121F">>},
  {<<"hpack">>, <<"17670F83FF984AE6CD74B1C456EDDE906D27FF013740EE4D9EFAA4F1BF999633">>},
+ {<<"idna">>, <<"8A63070E9F7D0C62EB9D9FCB360A7DE382448200FBBD1B106CC96D3D8099DF8D">>},
  {<<"inert">>, <<"51586E4E77E3C5ABC00E3A12AEE829FB6E44D51E4C7957F7B97C4378A15985DD">>},
  {<<"inet_cidr">>, <<"4814A5B78B969A5E069B0CECBB102622AB0C459B690053ED94543CD529915A43">>},
  {<<"intercept">>, <<"1F6C725E6FC070720643BD4D97EE53B1209365C80E520E1F5A1ACB36712A7EB5">>},
  {<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>},
+ {<<"metrics">>, <<"25F094DEA2CDA98213CECC3AEFF09E940299D950904393B2A29D191C346A8486">>},
+ {<<"mimerl">>, <<"67E2D3F571088D5CFD3E550C383094B47159F3EEE8FFA08E64106CDF5E981BE3">>},
  {<<"multiaddr">>, <<"978E58E28F6FACAF428C87AF933612B1E2F3F2775F1794EDA5E831A4EACD2984">>},
  {<<"multihash">>, <<"F084F7C6BEC062F0C0E82AE18CFDC8DAEC8F4FAA4C8E1ACE0B9C676A9323162F">>},
+ {<<"parse_trans">>, <<"16328AB840CC09919BD10DAB29E431DA3AF9E9E7E7E6F0089DD5A2D2820011D8">>},
  {<<"procket">>, <<"467014637052CAB030DD32D5269591B82763420C9572F61CD6C5657FE4579777">>},
  {<<"prometheus">>, <<"FA76B152555273739C14B06F09F485CF6D5D301FE4E9D31B7FF803D26025D7A0">>},
  {<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
@@ -218,12 +232,15 @@
  {<<"sidejob">>, <<"5D6A7C9C620778CB1908E46B552D767DF2ED4D77070BB7B5B8773D4FF18D1D37">>},
  {<<"small_ints">>, <<"82A824C8794A2DDC73CB5CD00EAD11331DB296521AD16A619C13D668572B868A">>},
  {<<"splicer">>, <<"FD56E168D0F3BFC879858850E4F4572E9E1BA16AC3DC524D573085CA1157EC37">>},
- {<<"throttle">>, <<"E881B46D9836AFB70F3E2FA3BE9B0140805BA324ED26AA734FF6C5C1568C6CA7">>}]},
+ {<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>},
+ {<<"throttle">>, <<"E881B46D9836AFB70F3E2FA3BE9B0140805BA324ED26AA734FF6C5C1568C6CA7">>},
+ {<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]},
 {pkg_hash_ext,[
  {<<"acceptor_pool">>, <<"0CBCD83FDC8B9AD2EEE2067EF8B91A14858A5883CB7CD800E6FCD5803E158788">>},
  {<<"backoff">>, <<"CF0CFFF8995FB20562F822E5CC47D8CCF664C5ECDC26A684CBE85C225F9D7C39">>},
  {<<"base32">>, <<"10A73951D857D8CB1ECEEA8EB96C6941F6A76E105947AD09C2B73977DEE07638">>},
  {<<"base64url">>, <<"F9B3ADD4731A02A9B0410398B475B33E7566A695365237A6BDEE1BB447719F5C">>},
+ {<<"certifi">>, <<"6AC7EFC1C6F8600B08D625292D4BBF584E14847CE1B6B5C44D983D273E1097EA">>},
  {<<"ctx">>, <<"A14ED2D1B67723DBEBBE423B28D7615EB0BDCBA6FF28F2D1F1B0A7E1D4AA5FC2">>},
  {<<"ecc_compact">>, <<"86F8A8A33141C5390D72BDC2CE4D79B8CC74463A80D263A44FC988D353269504">>},
  {<<"elli">>, <<"698B13B33D05661DB9FE7EFCBA41B84825A379CCE86E486CF6AFF9285BE0CCF8">>},
@@ -232,13 +249,18 @@
  {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
  {<<"gpb">>, <<"3F4CB7F263E94675A598501A6DC96EC17F93ECB28C29BEA3BEA3A71C53A3317A">>},
  {<<"gproc">>, <<"580ADAFA56463B75263EF5A5DF4C86AF321F68694E7786CB057FD805D1E2A7DE">>},
+ {<<"hackney">>, <<"9AFCDA620704D720DB8C6A3123E9848D09C87586DC1C10479C42627B905B5C5E">>},
  {<<"hpack">>, <<"06F580167C4B8B8A6429040DF36CC93BBA6D571FAEAEC1B28816523379CBB23A">>},
+ {<<"idna">>, <<"92376EB7894412ED19AC475E4A86F7B413C1B9FBB5BD16DCCD57934157944CEA">>},
  {<<"inert">>, <<"1C45F2043FD80B18D7C00410D8DF9B7CA463A3F7479CB4E3A2745C60C81EDDE7">>},
  {<<"inet_cidr">>, <<"97046492E5C5BE0D8B92CD275980D667A8D28D9E79B2305828E358CC7D30A935">>},
  {<<"intercept">>, <<"FC5F5E26A571637B0B80119FE2F1E83DDDEAC8078BD76279C015474AF432B32E">>},
  {<<"lager">>, <<"7F904D9E87A8CB7E66156ED31768D1C8E26EBA1D54F4BC85B1AA4AC1F6340C28">>},
+ {<<"metrics">>, <<"69B09ADDDC4F74A40716AE54D140F93BEB0FB8978D8636EADED0C31B6F099F16">>},
+ {<<"mimerl">>, <<"F278585650AA581986264638EBF698F8BB19DF297F66AD91B18910DFC6E19323">>},
  {<<"multiaddr">>, <<"980D3EA5EB0EB2EFC51E3D10953F17447D417C49BD2FCD7FC6A2A42D1F66D5EE">>},
  {<<"multihash">>, <<"E73AD5D0099DBFFB4EE429A78436B605AFE2530ED684AB36BB86733AB65707C8">>},
+ {<<"parse_trans">>, <<"07CD9577885F56362D414E8C4C4E6BDF10D43A8767ABB92D24CBE8B24C54888B">>},
  {<<"procket">>, <<"037287B8D10A747E54A69BDCE56724ECC8BE12BCB8233AE4D6F885F0ED71E895">>},
  {<<"prometheus">>, <<"6EDFBE928D271C7F657A6F2C46258738086584BD6CAE4A000B8B9A6009BA23A5">>},
  {<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
@@ -248,5 +270,7 @@
  {<<"sidejob">>, <<"6DC3DAC041C8C07C64401ECD22684730DA1497F5F14377B3CA9C5B2B9A135181">>},
  {<<"small_ints">>, <<"00B3BFF6C446711F8EA4EA942056F375E0F13C7983CC3950C6EA1DE014C7C416">>},
  {<<"splicer">>, <<"4F99B98309D3017377A417D250BC4E90AC5B408F6639665F0108F9AC888B4BEE">>},
- {<<"throttle">>, <<"3EACFAAC1C2EBD0F17D77D9E96B1029BF07DED4AC233BA38883D70CDF1FFF740">>}]}
+ {<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>},
+ {<<"throttle">>, <<"3EACFAAC1C2EBD0F17D77D9E96B1029BF07DED4AC233BA38883D70CDF1FFF740">>},
+ {<<"unicode_util_compat">>, <<"25EEE6D67DF61960CF6A794239566599B09E17E668D3700247BC498638152521">>}]}
 ].
diff --git a/src/poc/miner_poc_mgr.erl b/src/poc/miner_poc_mgr.erl
@@ -292,7 +292,7 @@ save_poc_key_proposals(Address, KeyProposals, Height) ->
                 key = KeyProposal
             },
             lager:debug("caching poc key proposal ~p", [KeyProposal]),
-            _ = cache_poc_key_proposal(KeyProposal, POCKeyProposalRec)
+            _ = catch cache_poc_key_proposal(KeyProposal, POCKeyProposalRec)
         end
         || KeyProposal <- KeyProposals
     ],

diff --git a/test/miner_poc_grpc_SUITE.erl b/test/miner_poc_grpc_SUITE.erl
@@ -543,7 +543,6 @@ extra_vars(grpc) ->
                  ?poc_challenger_type => validator,
                  ?poc_timeout => 4,
                  ?poc_receipts_absorb_timeout => 2,
-                 ?poc_validator_ephemeral_key_count => 10,
                  ?poc_validator_ephemeral_key_timeout => 50
     },
     maps:merge(extra_vars(poc_v11), GrpcVars);