Breaking changes, the gpg field inside config is an object now!

8 files changed, 53 insertions, 22 deletions

diff --git a/bin/ak-gpg b/bin/ak-gpg
index e3169ca..03fee4f 100755
--- a/bin/ak-gpg
+++ b/bin/ak-gpg
@@ -63,7 +63,7 @@ if [ ! -z $1 ]; then
         --example) example; exit;;
         --get-key-self-as-ipfs) _ak_gpg_key_self_get_fingerprint_from_config; exit;;
         --get-key-self-as-fingerprint) _ak_gpg_key_self_get_fingerprint; exit;;
-        --get-key-fingerprint-from-ipfs) _ak_gpg_key_get_fingerprint_from_ipfs $1; exit;;
+        --get-key-fingerprint-from-ipfs) shift; _ak_gpg_key_get_fingerprint_from_ipfs $1; exit;;
         --export-key-self-to-file) _ak_gpg_key_self_export 'self.pub'; exit;;
         --clear-sign) shift; _ak_gpg_sign_clear "$2" "$1"; exit;;
         --verify-file) shift; _ak_gpg_verify_clear_signature "$1"; exit;;
diff --git a/bin/ak-mempool b/bin/ak-mempool
index d411ca2..a994340 100755
--- a/bin/ak-mempool
+++ b/bin/ak-mempool
@@ -45,7 +45,12 @@ while IFS="" read -r p || [ -n "$p" ]
 do
     peer="$(echo "$p" | sed -e 's/^.*\///')"
     _ak_log_info "Peer $peer found! Examining..."
-    _ak_ipfs_cat /ipns/$peer/zlatest
+    resolved_peer_ns="$(_ak_ipns_resolve /ipns/${peer})"
+    if [ -n "${resolved_peer_ns}" ]
+    then
+        _ak_log_info "Resolved peer: ${resolved_peer_ns}"
+        _ak_ipfs_cat $resolved_peer_ns/zlatest
+    fi
 done < tmp_peers
 
 rm tmp_peers
diff --git a/config.sh b/config.sh
index ac63acb..c8ac722 100755
--- a/config.sh
+++ b/config.sh
@@ -26,6 +26,7 @@ export AK_MINEDBLOCKSDIR="$AK_WORKDIR/mined_blocks"
 export AK_ZBLOCKSFILE="$AK_WORKDIR/zBlocksFile"
 export AK_ZPAIRSFILE="$AK_WORKDIR/pairsFile"
 export AK_ZPEERSFILE="$AK_WORKDIR/peersFile"
+export AK_ZPEERSDIR="$AK_WORKDIR/peers"
 export AK_CACHEDIR="$AK_WORKDIR/cache"
 export AK_CHUNKSDIR="$AK_WORKDIR/akfs/chunks"
 export AK_LEAFSDIR="$AK_WORKDIR/akfs/leafs"
diff --git a/init.sh b/init.sh
index 8edb985..06a390c 100755
--- a/init.sh
+++ b/init.sh
@@ -73,6 +73,7 @@ if [ ! -f $AK_ZGENESISASC ] ; then printf "%s" "$(_ak_ipfs add -q $AK_GENESISASC
 if [ ! -f $AK_ZBLOCKSFILE ] ; then printf "[]" > $AK_ZBLOCKSFILE;fi
 if [ ! -f $AK_ZPAIRSFILE ] ; then printf "[]" > $AK_ZPAIRSFILE;fi
 if [ ! -f $AK_ZPEERSFILE ] ; then printf "[]" > $AK_ZPEERSFILE;fi
+if [ ! -d $AK_ZPEERSDIR ] ; then mkdir $AK_ZPEERSDIR;fi
 
 ipfs_zarchive_check_or_mkdir
 
diff --git a/lib/_ak_config b/lib/_ak_config
index d8705d8..f8b1460 100755
--- a/lib/_ak_config
+++ b/lib/_ak_config
@@ -31,7 +31,10 @@ function _ak_config_show(){
 {
     "profile":'$profile',
     "genesis":"'$(cat $AK_WORKDIR/config/zgenesis)'",
-    "gpg":"'$GPG_PUB_KEY'",
+    "gpg":{
+        "ipfs":"'$GPG_PUB_KEY'",
+        "fingerprint":"'$(ak gpg --get-key-fingerprint-from-ipfs $GPG_PUB_KEY)'"
+    },
     "zchain":"'$(cat $AK_WORKDIR/config/zchain)'",
     "zlatest":"'$(ak zchain --get-latest)'"
 }'| jq;
@@ -43,8 +46,9 @@ function _ak_config_publish(){
     _ak_ipfs_config_publish $ipfs_hash
     if [ $? != 0 ]
     then
-        echo -e "\033[0;34mError on publishing\033[0;0m\nYour information:\n"
-        cat tmpfile
+        _ak_log_error "Error on publishing"
+        _ak_log_debug "Your information:"
+        cat tmpfile | while read line; do _ak_log_debug "$line"; done
         exit 1
     fi
     rm tmpfile
diff --git a/lib/_ak_network_cjdns b/lib/_ak_network_cjdns
index 51cd7d8..31c587b 100755
--- a/lib/_ak_network_cjdns
+++ b/lib/_ak_network_cjdns
@@ -166,17 +166,6 @@ function _ak_network_cjdns_scan(){
     fi
 }
 
-function _ak_network_yggdrasil_scan(){
-    if [ ! -z $1 ] && [ -n "$1" ]
-    then
-        case $1 in
-            *) _ak_network_yggdrasil_scan_full; exit;;
-        esac
-    else
-        _ak_network_yggdrasil_scan_full
-    fi
-}
-
 function _ak_network_cjdns_show_peers(){
     if [ -f $AK_ZPEERSFILE.hyperboria ]
     then
diff --git a/lib/_ak_network_yggdrasil b/lib/_ak_network_yggdrasil
index 9ec68d2..a551cd6 100755
--- a/lib/_ak_network_yggdrasil
+++ b/lib/_ak_network_yggdrasil
@@ -28,32 +28,54 @@ function _ak_network_yggdrasil_scan_full(){
     #
     TEMPDIR="$(_ak_make_temp_directory)"
     cd $TEMPDIR
+    last_seen="$TEMPDIR/ls"
     pubkeys_ips="$TEMPDIR/pi"
     online_ips="$TEMPDIR/oi"
+    online_pairs="$TEMPDIR/op"
     filtered_online_pubkeys_ips="$TEMPDIR/fopi"
     curl -s \
         --connect-timeout 5 \
+        "http://yia.yggdrasil-network.ca/crawler/crawler-yia.peers.$(date -u +%Y%m%d)" > $last_seen
+    if [ $? -ne 0 ]
+    then
+        _ak_log_error "Couldn't fetch active peers from YIA"
+        exit 1
+    fi
+    curl -s \
+        --connect-timeout 5 \
         "http://yia.yggdrasil-network.ca/crawler/crawler-yia.pubkey" > $pubkeys_ips
     if [ $? -ne 0 ]
     then
-        _ak_log_error "Couldn't fetch DB from YIA"
+        _ak_log_error "Couldn't fetch public key DB from YIA"
         exit 1
     fi
+    cat $last_seen | tr ' ' '\n' | sort | uniq | while read key
+    do
+        grep ${key} ${pubkeys_ips} >> ${online_pairs}
+    done
     counter=0
     count=0
-    max="$(cat $pubkeys_ips|wc -l)"
+    max="$(cat $online_pairs|wc -l)"
     printf '[' > walk.aknet
-    cat $pubkeys_ips \
+    cat $online_pairs \
         | sort \
         | uniq \
         | while read -r pkey ip || [ -n "$ip" ]
     do
         count="$(( $count + 1 ))"
         _ak_log_debug "Scanning [${count}/${max}] $ip..."
-        node_info="$(curl \
+        node_fs_path="$AK_ZPEERSDIR/ygg/$(echo -n $ip| sed 's/://g')"
+        scan_ts="$(date -u +%s)"
+        if [ ! -d ${node_fs_path} ]
+        then
+            mkdir -p ${node_fs_path}
+        fi
+        node_fs_pathname="${node_fs_path}/${scan_ts}"
+        curl \
             --connect-timeout 3 \
             -A 'akd/0.1.0; https://github.com/arching-kaos' \
-            "http://[$ip]:8610/v0/node_info" 2>/dev/null | jq -c -M)"
+            "http://[$ip]:8610/v0/node_info" 2>/dev/null | jq -c -M > ${node_fs_pathname}
+        node_info="$(cat ${node_fs_pathname})"
         if [ $? -eq 0 ] && [ $(echo -n "$node_info" | wc -c) -gt 0 ]
         then
             if [ "$counter" -ne "0" ]
@@ -82,3 +104,12 @@ function _ak_network_yggdrasil_show_peers(){
         _ak_log_debug "No yggdrasil peers found"
     fi
 }
+
+function _ak_network_yggdrasil_scan(){
+    if [ ! -z $1 ] && [ -n "$1" ]
+    then
+        _ak_network_yggdrasil_scan_specific $1
+    else
+        _ak_network_yggdrasil_scan_full
+    fi
+}
diff --git a/lib/_ak_node b/lib/_ak_node
index 04aa07b..37d8a00 100755
--- a/lib/_ak_node
+++ b/lib/_ak_node
@@ -28,5 +28,5 @@ function _ak_node_info_ipfs_hash(){
 # Finds ak-config ipns key
 # Returns IPNS key
 function _ak_node_info_ipns_key(){
-    _ak_ipfs_key_list_full | grep ak-config | awk '{print $1}'
+    _ak_ipfs_key_list_full | grep 'ak-config' | awk '{print $1}'
 }