Support OTP 24 and rebar 3.14

rebar.config

@@ -10,7 +10,7 @@
 
 {deps, [
         {blockchain, {git, "https://github.com/helium/blockchain-core.git",
-                      {branch, "master"}}},
+                      {branch, "adt/rebar3.14"}}},
         {hbbft, {git, "https://github.com/helium/erlang-hbbft.git",
                  {branch, "master"}}},
         {dkg, {git, "https://github.com/helium/erlang-dkg.git", {branch, "master"}}},

rebar.lock

@@ -1,10 +1,10 @@
-{"1.1.0",
+{"1.2.0",
 [{<<"backoff">>,{pkg,<<"backoff">>,<<"1.1.6">>},2},
  {<<"base32">>,{pkg,<<"base32">>,<<"0.1.0">>},4},
  {<<"base64url">>,{pkg,<<"base64url">>,<<"1.0.1">>},1},
  {<<"blockchain">>,
   {git,"https://github.com/helium/blockchain-core.git",
-       {ref,"5d7c1bc778c36b6b2978df784a9770a93b4cae79"}},
+       {ref,"fa75e3b3c59da9486a15a46df4e67d66ac25f137"}},
   0},
  {<<"clique">>,
   {git,"https://github.com/helium/clique.git",
@@ -94,10 +94,7 @@
   {git,"https://github.com/etrepum/kvc",
        {ref,"5f482a8db330c4dcb2d456b6135c740b8ff7eebb"}},
   0},
- {<<"lager">>,
-  {git,"https://github.com/erlang-lager/lager.git",
-       {ref,"91575d4479c897451edf138c10fa86c3125ec52e"}},
-  1},
+ {<<"lager">>,{pkg,<<"lager">>,<<"3.9.0">>},1},
  {<<"libp2p">>,
   {git,"https://github.com/helium/erlang-libp2p.git",
        {ref,"7261c24db1a6d035398327f57096946faf0309f0"}},
@@ -152,6 +149,7 @@
  {<<"inert">>, <<"E5C7568C5EF0C6103FEDB1CBDB29F32D701985E3588E1FAC37AEBA96671BA11B">>},
  {<<"inet_cidr">>, <<"4814A5B78B969A5E069B0CECBB102622AB0C459B690053ED94543CD529915A43">>},
  {<<"intercept">>, <<"1F6C725E6FC070720643BD4D97EE53B1209365C80E520E1F5A1ACB36712A7EB5">>},
+ {<<"lager">>, <<"903A7303E3542F000F28F94B5C1B1A958A49F5E84FDAF6DF8549D3596EE5AE3D">>},
  {<<"libp2p_crypto">>, <<"CB223150945FBE6388B7AB9E46BB47DC189AD2757DCD2B87CEDBFDD5E79B212E">>},
  {<<"multiaddr">>, <<"978E58E28F6FACAF428C87AF933612B1E2F3F2775F1794EDA5E831A4EACD2984">>},
  {<<"procket">>, <<"1FC0D557ACC0145DD167C566C68F83B183E923016904DFE980534B3C9150E92B">>},
@@ -160,5 +158,27 @@
  {<<"recon">>, <<"430FFA60685AC1EFDFB1FE4C97B8767C92D0D92E6E7C3E8621559BA77598678A">>},
  {<<"small_ints">>, <<"82A824C8794A2DDC73CB5CD00EAD11331DB296521AD16A619C13D668572B868A">>},
  {<<"splicer">>, <<"4958B9D41C8E3DEB0F906804BB6D963C32AE277674951D5D95C809A9E19AFE89">>},
- {<<"throttle">>, <<"E881B46D9836AFB70F3E2FA3BE9B0140805BA324ED26AA734FF6C5C1568C6CA7">>}]}
+ {<<"throttle">>, <<"E881B46D9836AFB70F3E2FA3BE9B0140805BA324ED26AA734FF6C5C1568C6CA7">>}]},
+{pkg_hash_ext,[
+ {<<"backoff">>, <<"CF0CFFF8995FB20562F822E5CC47D8CCF664C5ECDC26A684CBE85C225F9D7C39">>},
+ {<<"base32">>, <<"10A73951D857D8CB1ECEEA8EB96C6941F6A76E105947AD09C2B73977DEE07638">>},
+ {<<"base64url">>, <<"F9B3ADD4731A02A9B0410398B475B33E7566A695365237A6BDEE1BB447719F5C">>},
+ {<<"ecc_compact">>, <<"3DB649D21AE7FEDF460B4D650B99813B761DD905EED6286420C2B2C7E169A356">>},
+ {<<"enacl">>, <<"60D329AC3976008F774E21ABA254671104976D61A792287615BB26816F09EA0F">>},
+ {<<"erl_base58">>, <<"41E8EC356C5C5558A45682F61F80725789AE9A11BD1CC7D5C73CDE1E3B546DD2">>},
+ {<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>},
+ {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>},
+ {<<"inert">>, <<"F22D6663D6A5BE7C3E47B42839F9A5421D023C5952CE926828A45BBD5A7A0DAA">>},
+ {<<"inet_cidr">>, <<"97046492E5C5BE0D8B92CD275980D667A8D28D9E79B2305828E358CC7D30A935">>},
+ {<<"intercept">>, <<"FC5F5E26A571637B0B80119FE2F1E83DDDEAC8078BD76279C015474AF432B32E">>},
+ {<<"lager">>, <<"B10B5D237674AC515B49018A38460145FC348A1A8000A0F0A498E99D474B1277">>},
+ {<<"libp2p_crypto">>, <<"A9B1AEBA3FA45123CC165E542DAF242EFC53CFACFF738C51561D4FEF73EAF71C">>},
+ {<<"multiaddr">>, <<"980D3EA5EB0EB2EFC51E3D10953F17447D417C49BD2FCD7FC6A2A42D1F66D5EE">>},
+ {<<"procket">>, <<"647C2D1F5006370E457522ECC69509F1020D7D558F3D6E196825E1F4F3660218">>},
+ {<<"ranch">>, <<"86D40FC42AA47BCB6952DDF1DBFD3DA04B5BA69AFB65C322C99845913250B11F">>},
+ {<<"rand_compat">>, <<"CDF7BE2B17308EC245B912C45FE55741F93B6E4F1A24BA6074F7137B0CC09BF4">>},
+ {<<"recon">>, <<"5721C6B6D50122D8F68CCCAC712CAA1231F97894BAB779EFF5FF0F886CB44648">>},
+ {<<"small_ints">>, <<"00B3BFF6C446711F8EA4EA942056F375E0F13C7983CC3950C6EA1DE014C7C416">>},
+ {<<"splicer">>, <<"4CF35A54B8B5D37902DE036B8DADBF9B95B28C276359B8CCD64A35B8AFFEF65A">>},
+ {<<"throttle">>, <<"3EACFAAC1C2EBD0F17D77D9E96B1029BF07DED4AC233BA38883D70CDF1FFF740">>}]}
 ].

scripts/extensions/authorize

@@ -1,6 +1,19 @@
 #!/bin/sh
 if [ -t 0 ] ; then
-    export CLIQUE_COLUMNS=`stty size 2>/dev/null | cut -d ' ' -f 2`
+    CLIQUE_COLUMNS=$(stty size 2>/dev/null | cut -d ' ' -f 2)
+    export CLIQUE_COLUMNS
 fi
-relx_nodetool rpc miner_console command authorize $@
+
+j=1
+l=$#
+buf="[[\"authorize\","
+while [ $j -le $l ]; do
+    buf="$buf\"$1\","
+    j=$(( j + 1 ))
+    shift
+done
+
+buf="${buf%?}]]"
+
+relx_nodetool rpc blockchain_console command "$buf"
 exit $?

scripts/extensions/dkg

@@ -1,6 +1,19 @@
 #!/bin/sh
 if [ -t 0 ] ; then
-    export CLIQUE_COLUMNS=`stty size 2>/dev/null | cut -d ' ' -f 2`
+    CLIQUE_COLUMNS=$(stty size 2>/dev/null | cut -d ' ' -f 2)
+    export CLIQUE_COLUMNS
 fi
-relx_nodetool rpc miner_console command dkg $@
+
+j=1
+l=$#
+buf="[[\"dkg\","
+while [ $j -le $l ]; do
+    buf="$buf\"$1\","
+    j=$(( j + 1 ))
+    shift
+done
+
+buf="${buf%?}]]"
+
+relx_nodetool rpc blockchain_console command "$buf"
 exit $?

scripts/extensions/genesis

@@ -1,6 +1,19 @@
 #!/bin/sh
 if [ -t 0 ] ; then
-    export CLIQUE_COLUMNS=`stty size 2>/dev/null | cut -d ' ' -f 2`
+    CLIQUE_COLUMNS=$(stty size 2>/dev/null | cut -d ' ' -f 2)
+    export CLIQUE_COLUMNS
 fi
-relx_nodetool rpc miner_console command genesis $@
+
+j=1
+l=$#
+buf="[[\"genesis\","
+while [ $j -le $l ]; do
+    buf="$buf\"$1\","
+    j=$(( j + 1 ))
+    shift
+done
+
+buf="${buf%?}]]"
+
+relx_nodetool rpc blockchain_console command "$buf"
 exit $?

scripts/extensions/hbbft

@@ -1,6 +1,19 @@
 #!/bin/sh
 if [ -t 0 ] ; then
-    export CLIQUE_COLUMNS=`stty size 2>/dev/null | cut -d ' ' -f 2`
+    CLIQUE_COLUMNS=$(stty size 2>/dev/null | cut -d ' ' -f 2)
+    export CLIQUE_COLUMNS
 fi
-relx_nodetool rpc miner_console command hbbft $@
+
+j=1
+l=$#
+buf="[[\"hbbft\","
+while [ $j -le $l ]; do
+    buf="$buf\"$1\","
+    j=$(( j + 1 ))
+    shift
+done
+
+buf="${buf%?}]]"
+
+relx_nodetool rpc blockchain_console command "$buf"
 exit $?

scripts/extensions/info

@@ -1,6 +1,19 @@
 #!/bin/sh
 if [ -t 0 ] ; then
-    export CLIQUE_COLUMNS=`stty size 2>/dev/null | cut -d ' ' -f 2`
+    CLIQUE_COLUMNS=$(stty size 2>/dev/null | cut -d ' ' -f 2)
+    export CLIQUE_COLUMNS
 fi
-relx_nodetool rpc miner_console command info $@
+
+j=1
+l=$#
+buf="[[\"info\","
+while [ $j -le $l ]; do
+    buf="$buf\"$1\","
+    j=$(( j + 1 ))
+    shift
+done
+
+buf="${buf%?}]]"
+
+relx_nodetool rpc blockchain_console command "$buf"
 exit $?

scripts/extensions/print_keys

@@ -4,7 +4,7 @@ CONFIG=$(find $ROOTDIR/releases -name sys.config)
 LIB_DIR=$ROOTDIR/lib
 
 if relx_nodetool "ping" > /dev/null 2>&1; then
-    relx_nodetool rpc miner_keys print_keys
+    relx_nodetool rpc miner_keys print_keys "[[]]"
     exit $?
 fi