diff options
| -rwxr-xr-x | api/make_cache.sh | 2 | ||||
| -rw-r--r-- | api/routes/getZLatest/index.js | 2 | ||||
| -rwxr-xr-x | api/tests/announce_zblock.sh | 4 | ||||
| -rwxr-xr-x | api/tests/node_local_zlatest.sh | 2 | ||||
| -rwxr-xr-x | bin/ak-zchain | 3 | ||||
| -rwxr-xr-x | lib/_ak_config | 2 | ||||
| -rwxr-xr-x | lib/_ak_zblock | 2 | ||||
| -rwxr-xr-x | lib/_ak_zchain | 4 |
8 files changed, 14 insertions, 7 deletions
diff --git a/api/make_cache.sh b/api/make_cache.sh index 71e80ca..e5f9bfc 100755 --- a/api/make_cache.sh +++ b/api/make_cache.sh @@ -1,5 +1,5 @@ #!/bin/bash ak-find-latest-mined-sblock > $AK_CACHEDIR/ak-find-latest-mined-sblock.json ak zchain --crawl > $AK_CACHEDIR/ak-get-chain-minified.json -ak-get-zlatest > $AK_CACHEDIR/ak-get-zlatest.json +ak zchain --get-latest > $AK_CACHEDIR/ak-get-zlatest.json diff --git a/api/routes/getZLatest/index.js b/api/routes/getZLatest/index.js index 9141a4e..3fdd88c 100644 --- a/api/routes/getZLatest/index.js +++ b/api/routes/getZLatest/index.js @@ -10,7 +10,7 @@ const { spawn } = require('child_process'); */ function getZLatest(req, res) { - const command = spawn("ak-get-zlatest"); + const command = spawn("ak-zchain", ["--get-latest"]); var buffer = ""; command.stdout.on("data", data => { buffer += data; diff --git a/api/tests/announce_zblock.sh b/api/tests/announce_zblock.sh index 15caec8..11572c0 100755 --- a/api/tests/announce_zblock.sh +++ b/api/tests/announce_zblock.sh @@ -3,7 +3,7 @@ PROGRAM="$(basename $0)" printf '[%s]\n' "$PROGRAM" printf "TEST\t/v0/announce/zblock\n" printf "\t01:\tendpoint with valid data" -curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak-get-zlatest)'"}' 2>/dev/null | jq -M -c > /dev/null +curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak zchain --get-latest)'"}' 2>/dev/null | jq -M -c > /dev/null if [ $? -eq 0 ] then printf "\t\t\033[0;32mPASSED\033[0;0m" @@ -13,7 +13,7 @@ fi printf "\n" printf "\t02:\tendpoint with invalid data" -curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak-get-zlatest)'sdfas"}' 2>/dev/null | jq -M -c > /dev/null +curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":"'$(ak zchain --get-latest)'sdfas"}' 2>/dev/null | jq -M -c > /dev/null if [ $? -eq 0 ] then printf "\t\t\033[0;32mPASSED\033[0;0m" diff --git a/api/tests/node_local_zlatest.sh b/api/tests/node_local_zlatest.sh index b470f1d..aaf2681 100755 --- a/api/tests/node_local_zlatest.sh +++ b/api/tests/node_local_zlatest.sh @@ -2,7 +2,7 @@ PROGRAM="$(basename $0)" printf '[%s]\n' "$PROGRAM" API_RES="$(curl http://127.0.0.1:8610/v0/zlatest 2>/dev/null | sha512sum - | awk '{ printf $1 }')" -CMD_RES="$(ak-get-zlatest | sed -e 's/^/{"zlatest":"/; s/$/"}/' | sha512sum - | awk '{ printf $1 }')" +CMD_RES="$(ak zchain --get-latest | sed -e 's/^/{"zlatest":"/; s/$/"}/' | sha512sum - | awk '{ printf $1 }')" printf "TEST /zlatest\n" printf "\t01:\tLatest is the same between API response and CLI..." if [ "$API_RES" == "$CMD_RES" ] diff --git a/bin/ak-zchain b/bin/ak-zchain index 06a1341..73d38ba 100755 --- a/bin/ak-zchain +++ b/bin/ak-zchain @@ -43,6 +43,8 @@ ## ## --crawl-remote-ipns Crawls a remote zchain from ipns key ## +## --get-latest Returns the latest zblock from your zchain +## fullprogrampath="$(realpath $0)" PROGRAM=$(basename $0) descriptionString="Zchain tools" @@ -65,6 +67,7 @@ if [ ! -z $1 ]; then --crawl-self) _ak_zchain_crawl_self; exit;; --crawl-remote-ipfs) _ak_zchain_crawl_remote_ipfs $2; exit;; --crawl-remote-ipns) _ak_zchain_crawl_remote_ipns $2; exit;; + --get-latest) _ak_zchain_get_latest; exit;; * ) _ak_usage;; esac else _ak_usage diff --git a/lib/_ak_config b/lib/_ak_config index 0159453..f47a7c5 100755 --- a/lib/_ak_config +++ b/lib/_ak_config @@ -15,7 +15,7 @@ _ak_config_show(){ "genesis":"'$(cat $AK_WORKDIR/config/zgenesis)'", "gpg":"'$GPG_PUB_KEY'", "zchain":"'$(cat $AK_WORKDIR/config/zchain)'", - "zlatest":"'$(ak-get-zlatest)'" + "zlatest":"'$(ak zchain --get-latest)'" }'| jq; } diff --git a/lib/_ak_zblock b/lib/_ak_zblock index b2db633..78c1586 100755 --- a/lib/_ak_zblock +++ b/lib/_ak_zblock @@ -677,7 +677,7 @@ _ak_zblock_announce(){ curl \ --connect-timeout 3 \ --header 'Content-Type: application/json' \ - --data-raw '{"zblock":"'$(ak-get-zlatest)'"}' \ + --data-raw '{"zblock":"'$(_ak_zchain_get_latest)'"}' \ "http://127.0.0.1:8610/v0/announce/zblock" \ 2>/dev/null | jq -M -c > /dev/null if [ $? -ne 0 ] diff --git a/lib/_ak_zchain b/lib/_ak_zchain index 3776e49..c809b5d 100755 --- a/lib/_ak_zchain +++ b/lib/_ak_zchain @@ -231,6 +231,10 @@ _ak_zchain_crawl_remote_ipns(){ #ak enter -n $1 } +_ak_zchain_get_latest(){ + _ak_ipfs_files_stat /zlatest | head -n 1| tr -d '\n' +} + # _ak_zchain_announce(){} # PROGRAM="$(basename $0)" # printf '[%s]\n' "$PROGRAM" |