new: ak-sblock, lib/_ak_sblock + refactoring

- moved ak-sblock-show to _ak_sblock_show function
- `ak sblock show` can show a mined sblock now

5 files changed, 47 insertions, 12 deletions

diff --git a/README b/README
index 94a4816..c34749d 100644
--- a/README
+++ b/README
@@ -273,7 +273,7 @@ Schain tools
  - ak-mempool                      # TODO
  - ak-miner-script             PROTO Prototype miner
  - ak-network                      # Network Tools (connect to, scan for, dump peers)
- - ak-sblock-show                  # Returns a mined SBLOCK
+ - ak-sblock                       # Returns a mined SBLOCK
  - ak-find-latest-mined-sblock     # In a hay of SBLOCKS finds the latest
 
 Network scouting
diff --git a/bin/ak-sblock b/bin/ak-sblock
new file mode 100755
index 0000000..68e6870
--- /dev/null
+++ b/bin/ak-sblock
@@ -0,0 +1,29 @@
+#!/bin/bash
+##
+## Tools to show/read sblocks
+##
+## Usage:
+##
+##    -h, --help                  Prints this help message
+##
+##    -s, --show <sblock-hash>    Show a particular SBLOCK
+##
+fullprogrampath="$(realpath $0)"
+PROGRAM=$(basename $0)
+descriptionString="Sblock tools"
+
+# At least these
+source $AK_LIBDIR/_ak_log
+source $AK_LIBDIR/_ak_script
+source $AK_LIBDIR/_ak_sblock
+
+# Flags to run
+if [ ! -z $1 ]
+then
+    case $1 in
+        -h | --help) _ak_usage; exit;;
+        -s | --show) shift; _ak_sblock_show $1; exit;;
+        * ) _ak_usage;;
+    esac
+else _ak_usage
+fi
diff --git a/bin/ak-sblock-show b/bin/ak-sblock-show
deleted file mode 100755
index e840740..0000000
--- a/bin/ak-sblock-show
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-PROGRAM="$(basename $0)"
-
-if [ ! -z $1 ]
-then
-    cat $AK_MINEDBLOCKSDIR/$1 | jq
-else
-    echo "No sblock hash input"
-fi
diff --git a/lib/_ak_sblock b/lib/_ak_sblock
new file mode 100755
index 0000000..04038da
--- /dev/null
+++ b/lib/_ak_sblock
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+source $AK_LIBDIR/_ak_log
+
+_ak_sblock_show(){
+    if [ ! -z $1 ]
+    then
+        cat $AK_MINEDBLOCKSDIR/$1 | jq
+    else
+        _ak_log_error "No sblock hash input"
+    fi
+}
diff --git a/lib/_ak_schain b/lib/_ak_schain
index 2ff56eb..3813b98 100755
--- a/lib/_ak_schain
+++ b/lib/_ak_schain
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+source $AK_LIBDIR/_ak_sblock
+
 AK_SCHAINSDIR=$AK_WORKDIR/schains
 GENESIS="00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
 
@@ -62,8 +65,8 @@ _ak_schain_crawl(){
         _ak_log_warning "Could not find $CUR_TARGET"
     else
         ( echo -n '{"sblock":"'$1'",' &&
-        ak-sblock-show $CUR_TARGET | sed -e 's/^{//g') | jq
-        NEXT_TARGET="$(ak-sblock-show $CUR_TARGET | jq -r '.previous')"
+        _ak_sblock_show $CUR_TARGET | sed -e 's/^{//g') | jq
+        NEXT_TARGET="$(_ak_sblock_show $CUR_TARGET | jq -r '.previous')"
         _ak_log_info "Found previous: $NEXT_TARGET"
         _ak_schain_crawl "$NEXT_TARGET"
     fi