From e4f18be94261b39544ef3bc50321f6aedeb45bd6 Mon Sep 17 00:00:00 2001 From: kaotisk Date: Sun, 31 Mar 2024 12:00:59 +0300 Subject: huge refactor, might breaking things --- lib/_ak_gpg | 2 +- lib/_ak_ipfs | 67 ++++- lib/_ak_log | 5 + lib/_ak_logit | 5 - lib/_ak_newline | 5 - lib/_ak_script | 64 +++++ lib/_ak_script_description | 16 -- lib/_ak_script_exit | 17 -- lib/_ak_zblock | 620 +++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 751 insertions(+), 50 deletions(-) create mode 100755 lib/_ak_log delete mode 100755 lib/_ak_logit delete mode 100755 lib/_ak_newline create mode 100755 lib/_ak_script delete mode 100755 lib/_ak_script_description delete mode 100755 lib/_ak_script_exit create mode 100755 lib/_ak_zblock (limited to 'lib') diff --git a/lib/_ak_gpg b/lib/_ak_gpg index b497da8..d1f7e68 100755 --- a/lib/_ak_gpg +++ b/lib/_ak_gpg @@ -1,5 +1,5 @@ #!/bin/bash -source $AK_LIBDIR/_ak_logit +source $AK_LIBDIR/_ak_log _ak_gpg(){ gpg2 --homedir $AK_GPGHOME $* diff --git a/lib/_ak_ipfs b/lib/_ak_ipfs index 71bdb93..1c1e430 100755 --- a/lib/_ak_ipfs +++ b/lib/_ak_ipfs @@ -1,9 +1,9 @@ #!/bin/bash -source $AK_LIBDIR/_ak_logit -IPFS_REPO="$AK_WORKDIR/ipfsrepo" +source $AK_LIBDIR/_ak_log +AK_IPFS_REPO="$AK_WORKDIR/ipfsrepo" _ak_ipfs(){ - export IPFS_PATH=$IPFS_REPO; ipfs $* + export IPFS_PATH=$AK_IPFS_REPO; ipfs $* } _ak_ipfs_get_peers(){ @@ -224,7 +224,7 @@ _ak_ipfs_starter(){ _ak_ipns_resolve(){ if [ ! -z $1 ] then - rsld=$(ak-ipfs-name-resolve $1) + rsld=$(_ak_ipfs_name_resolve $1) if [ $? -ne 0 ] then logit "ERROR" "Failed to resolve $1" @@ -233,12 +233,11 @@ _ak_ipns_resolve(){ echo -n $rsld | sed -e 's/\/ipfs\///' logit "INFO" "Resolved $1 to $rsld" else - exit 69 + exit 1 fi } _ak_ipfs_check(){ - _ak_ipfs_files_ls /zarchive > /dev/null if [ $? != 0 ] then @@ -281,3 +280,59 @@ _ak_ipfs_check(){ logit "INFO" "ak-config is there" fi } + +_ak_ipfs_init(){ + if [ ! -d $AK_IPFS_REPO ] + then + mkdir $AK_IPFS_REPO + _ak_ipfs init + + fi +} + +_ak_ipfs_download(){ + logit "INFO" "Attempting to install IPFS..." + IPFS_VERSION="$(curl -s https://dist.ipfs.tech/kubo/versions | tail -1)" + IPFS_TARGET_FILE="kubo_"$IPFS_VERSION"_linux-amd64.tar.gz" + + logit "INFO" "Downloading ipfs $IPFS_VERSION" + if [ ! -f $AK_ARCHIVESDIR/$IPFS_TARGET_FILE ] + then + wget -O $AK_ARCHIVESDIR/$IPFS_TARGET_FILE https://dist.ipfs.tech/kubo/$IPFS_VERSION/$IPFS_TARGET_FILE ; + else + logit "INFO" "Already have the latest version" + exit 0 + fi +} + +_ak_ipfs_cid_v0_check () { + if [ -z $1 ] || [ "$1" != "" ] + then + echo $1 | grep -e 'Qm.\{44\}' > /dev/null + if [ "$?" -ne 0 ] + then + logit "ERROR" "$1 is not an IPFS CIDv0 string" + exit 1 + fi + logit "INFO" "$1 provided is an IPFS CIDv0 string" + else + logit "ERROR" "No argument was provided" + exit 1 + fi +} + +_ak_ipfs_swarm_install() { + SWARMSHA512SUM="7001e37412758c43d372a969e977ca11511e034c8c1e233a58dc3ce1c6f3c1aa7d2da8cba9944a5eabaa8885742bfe6cc6794224c146b7129da8f633b53b9cfc" + + if [ ! -f $AK_IPFS_REPO/swarm.key ] + then + logit "INFO" "Downloading swarm key" + wget -O $AK_IPFS_REPO/swarm.key https://arching-kaos.net/files/swarm.key + elif [ -f $AK_IPFS_REPO/swarm.key ] && [ "$(sha512sum $AK_IPFS_REPO/swarm.key | awk '{ print $1 }')" == "$SWARMSHA512SUM" ] + then + logit "INFO" "Congrats! You are already in our swarm" + else + logit "ERROR" "Found swarm.key but not ours" + logit "ERROR" "Visit https://arching-kaos.net/files/swarm.key and copy it to your ipfs folder" + fi +} diff --git a/lib/_ak_log b/lib/_ak_log new file mode 100755 index 0000000..6a55f5f --- /dev/null +++ b/lib/_ak_log @@ -0,0 +1,5 @@ +#!/bin/bash + +logit(){ + ak-log-message "$PROGRAM" "$1" "$2" +} diff --git a/lib/_ak_logit b/lib/_ak_logit deleted file mode 100755 index c6e1b51..0000000 --- a/lib/_ak_logit +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -logit(){ - ak-logthis "$PROGRAM" "$1" "$2" -} diff --git a/lib/_ak_newline b/lib/_ak_newline deleted file mode 100755 index 955ee6c..0000000 --- a/lib/_ak_newline +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -new_line(){ - printf '\n' -} diff --git a/lib/_ak_script b/lib/_ak_script new file mode 100755 index 0000000..543f597 --- /dev/null +++ b/lib/_ak_script @@ -0,0 +1,64 @@ +#!/bin/bash +source $AK_LIBDIR/_ak_log + +# Wanna talk about it? +_ak_new_line(){ + printf '\n' +} + +_ak_exit_program(){ +# Needs rework: +# cd $curdir +# if [ "$3" == "save_log" ] +# then +# tar cvfz $curdir/$(basename $tempdir)-$launch_timestamp.tgz $tempdir +# fi +# rm -rf $tempdir + if [ $1 -ne 0 ] + then + logit "ERROR" "$2 ($1)" + else + logit "EXIT" "$2" + fi + exit $1 +} + +_ak_help(){ + if [ ! -z $fullprogrampath ] && [ -n "$fullprogrampath" ] + then + cat $fullprogrampath |grep '^##'| sed 's/^##//g;s/^ //g' 1>&2 + exit 1 + else + logit "ERROR" "fullprogrampath was not set" + exit 1 + fi +} + +_ak_title_description(){ + + if [ ! -n "$descriptionString" ] + then + # Choose to exit with error to enforce standard + logit "ERROR" "No description string" + exit 1 + # Alternative solution + # full_title="$(printf '%s' "$PROGRAM")" + fi + + full_title="$(printf '%s - %s' "$PROGRAM" "$descriptionString")" + delimiter_count=`echo -n $full_title | wc -c` + ( + printf '%s' "$full_title" + _ak_new_line + while [ $delimiter_count -gt 0 ] + do + printf '=' + delimiter_count=$(($delimiter_count-1)) + done + _ak_new_line ) 1>&2 +} + +_ak_usage(){ + _ak_title_description + _ak_help +} diff --git a/lib/_ak_script_description b/lib/_ak_script_description deleted file mode 100755 index 740b1c4..0000000 --- a/lib/_ak_script_description +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -source $AK_LIBDIR/_ak_newline - -description(){ - full_title="$(printf '%s - %s' "$PROGRAM" "$descriptionString")" - delimiter_count=`echo -n $full_title | wc -c` - printf '%s' "$full_title" - new_line - while [ $delimiter_count -gt 0 ] - do - printf '=' - delimiter_count=$(($delimiter_count-1)) - done - new_line -} diff --git a/lib/_ak_script_exit b/lib/_ak_script_exit deleted file mode 100755 index 81fe2c8..0000000 --- a/lib/_ak_script_exit +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -exit_program(){ -# cd $curdir -# if [ "$3" == "save_log" ] -# then -# tar cvfz $curdir/$(basename $tempdir)-$launch_timestamp.tgz $tempdir -# fi -# rm -rf $tempdir - if [ $1 -ne 0 ] - then - logit "EXIT" "$2 ($1)" - else - logit "EXIT" "$2" - fi - exit $1 -} diff --git a/lib/_ak_zblock b/lib/_ak_zblock new file mode 100755 index 0000000..72d94ab --- /dev/null +++ b/lib/_ak_zblock @@ -0,0 +1,620 @@ +#!/bin/bash +source $AK_LIBDIR/_ak_log +source $AK_LIBDIR/_ak_script +source $AK_LIBDIR/_ak_gpg + +_ak_zblock_show(){ +# _ak_zblock_show +# ak-zblock [IPFS CID] +# +# Returns a JSON array representing the chain retrieved. +# Logs messages to $LOGSFILE. + verify=1 + if [ ! -z "$1" ] && [ "$1" == "-h" ] || [ "$1" == "--help" ] + then + usage + exit + elif [ ! -z "$1" ] + then + echo $1 | grep -e 'Qm.\{44\}' >/dev/null + if [ $? -ne 0 ] + then + logit "ERROR" "Argument provided ($1) was not an IPFS CIDv0 string" + exit 1 + fi + entrance="$1" + else + entrance="$(cat $AK_ZLATEST)" + fi + ak-enter -l 1 "$entrance" > "$AK_CACHEDIR/fzblocks/$entrance" +} +# _ak_zblock_manipulator(){ +# #!/bin/bash +# # This file describe the structure of the ArchingKaos messages in their basis. +# # +# # As previously thought, we exchange one IPFS hash through whatever means we can. +# # +# # GPG is mentioned as a signing algorithm for encryption, decryption and signing. +# # Let's say we have a file named as `example` +# # +# # We can extend this with calling the encoder and further send the transaction +# # +# +# #FINGERPRINT="CHANGE THIS TO YOUR DEFAULT FINGERPRINT" +# # We acquire the GPG fingerprint by email address +# # The following example finds kaos@kaos.kaos' GPG fingerprint like this +# # FINGERPRINT="$(gpg2 --homedir $AK_GPGHOME --list-keys | grep kaos@kaos.kaos -1 | head -n1 | awk '{print $1}')" +# +# # Below, the usage information +# PROGRAM="$(basename $0)" +# source $AK_LIBDIR/_ak_log +# source $AK_LIBDIR/_ak_ipfs +# source $AK_LIBDIR/_ak_gpg +# +# usage(){ +# echo "Usage:" +# echo "$PROGRAM -b block_file | -h block_hash | dunno" +# echo "Creates and publishes a ZBLOCK based on a block and a previous" +# echo "zblock." +# echo "" +# echo "Either -b or -h is needed. If both, -h is used." +# echo "" +# echo "-b block_file Points to a block file that we want to fix." +# echo "-h block_hash If we don't have the block as a file, we can" +# echo " use it's hash to retrieve it and edit it." +# echo "-p previous_hash We refering to a previous hash for a ZBLOCK." +# echo "" +# echo "#TODO:" +# echo "-t timestamp Unix UTC timestamp in seconds." +# echo "-a \"module/action\" Change the action tag. Format: object/verb." +# echo " In sense, \"Add news -> news/add\"." +# echo "-d data In case you want to change the data, you 'll" +# echo " be changing potentially the key of the block" +# echo " and the data signature, otherwise your block" +# echo " will be unverified." +# echo "" +# } +# +# main(){ +# +# logit "INFO" "We are doing" $BLOCK_TO_ADD "with content" $PREVIOUS +# # We add it to IPFS +# MESSAGE_HASH=$(_ak_ipfs_add $MESSAGE) +# +# # We create a detached and armor signature of it +# MESSAGE_SIGN_FILE=$MESSAGE".asc" +# _ak_gpg_sign_detached $MESSAGE_SIGN_FILE $MESSAGE +# +# # We add the signature to IPFS +# MESSAGE_SIGNATURE=$(_ak_ipfs_add $MESSAGE_SIGN_FILE) +# +# # We will be using our public key also to put it in the block later +# KEY="gpg.pub" +# _ak_gpg_key_self_export $KEY +# GPG_PUB_KEY=$(_ak_ipfs_add $KEY) +# +# # Acquire last block of information, to chain this one with previous posted +# PREVIOUS=$(_ak_ipfs_files_stat /zlatest | head -n 1) +# +# # We create a block of json like this: +# cat > block < zblock << EOF +# { +# "block":"$BLOCK", +# "block_signature":"$BLOCK_SIGNATURE" +# } +# EOF +# ZBL="zblock" +# # and we add it on IPFS +# ZBLOCK=$(_ak_ipfs_add $ZBL) +# echo $ZBLOCK +# } +# +# if [ ! -z $2 ]; +# then +# PWD="$(pwd)" +# +# # We ask which BLOCK is goind to be edited +# BLOCK_TO_ADD="$1" +# # We ask for a ZBLOCK or GENESIS to put in the BLOCK +# PREVIOUS="$2" +# +# _ak_ipfs_cat "$BLOCK_TO_ADD" +# if [ $? == 0 ]; +# then +# echo "Nice! We found the block" +# _ak_ipfs_get "$BLOCK_TO_ADD" +# +# sed -i.bak -e 's/^.*previous.*$/\"previous\":\"'$PREVIOUS'\"/' $BLOCK_TO_ADD +# cat $BLOCK_TO_ADD | jq -M +# +# exit 2 +# else +# echo "Too bad, it seems the block is not there" +# exit 1 +# fi +# +# # cat $PWD/zblock | jq -M +# # Optional or extending with +# # python send_as_ak_tx $ZBLOCK +# # or for "offline" use +# echo $ZBLOCK > $ZLATEST +# _ak_ipfs_name_publish --key=zchain $ZBLOCK > /dev/null 2>&1 +# _ak_ipfs_files_mkdir /zarchive > /dev/null 2>&1 +# _ak_ipfs_files_cp /zlatest /zarchive/$(date -u +%s)-$(_ak_ipfs_files_stat /zlatest | head -n 1) > /dev/null 2>&1 +# _ak_ipfs_files_rm /zlatest > /dev/null 2>&1 +# _ak_ipfs_files_cp /ipfs/$ZBLOCK /zlatest > /dev/null 2>&1 +# else +# usage +# exit 0 +# fi +# +# } + +_ak_zblock_gen_html(){ + time_started=$(date -u +%s.%N) + ss=$(echo $time_started | cut -d '.' -f 1) + nss=$(echo $time_started | cut -d '.' -f 2) + # Check if there are enough arguments + if [ $# -lt 1 ] + then + logit "ERROR" "Not enough arguments provided" + _ak_help + exit 1 + fi + + if [ -n "$1" ] + then + TEST="$(echo -n "$1" | grep -v '^Qm[A-Za-z0-9]\{44\}$')" + if [ -n "$TEST" ] + then + echo not ok + exit 1 + fi + fi + + arg="$(mktemp)" + ak-enter -l 1 "$1" | jq '.[]' > $arg + + ( \ + # Create HTML document + echo "" + echo "" + echo "" + echo " Arching Kaos Chain Data" + echo ' ' + echo ' ' + echo ' ' + echo "" + echo "" + + # Iterate through each argument and parse data + if [ -f "$arg" ] + then + # Extract data from argument + zblock=$(cat $arg | jq -r '.zblock') + block=$(cat $arg | jq -r '.block') + timestamp=$(cat $arg | jq -r '.timestamp') + block_signature=$(cat $arg | jq -r '.block_signature') + detach=$(cat $arg | jq -r '.detach') + data=$(cat $arg | jq -r '.data') + module=$(cat $arg | jq -r '.module') + action=$(cat $arg | jq -r '.action') + gpg=$(cat $arg | jq -r '.gpg') + previous=$(cat $arg | jq -r '.previous') + datablock=$(cat $arg | jq -r ".$data") + + # Output data in HTML format + echo "

$PROGRAM

" + echo "

🔎 $zblock

" + if [ "$module" == "news" ] && [ "$action" == "add" ] + then + ak-news -x $zblock + fi + echo "

ℹī¸ $zblock

" + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo "
" + echo "
đŸ“Ļ ZBLOCK
" + echo "
" + echo "
" + echo " $zblock" + echo "
$(_ak_ipfs_cat $zblock | jq)
" + echo "
" + echo "
" + echo "
đŸ“Ļ BLOCK
" + echo "
" + echo "
" + echo " $block" + echo "
$(_ak_ipfs_cat $block | jq)
" + echo "
" + echo "
" + echo "
🔏 BLOCK SIGNATURE
" + echo "
" + echo "
" + echo " $block_signature" + echo "
$(_ak_ipfs_cat $block_signature)
" + echo "
" + echo "
" + echo "
⌚ TIMESTAMP
" + echo "
" + echo "

$timestamp

" + echo "
" + echo "
🔌 MODULE
" + echo "
" + echo "

$module

" + echo "
" + echo "
đŸĒ§ ACTION
" + echo "
" + echo "

$action

" + echo "
" + echo "
🔑 GPG
" + echo "
" + echo "
" + echo " $gpg" + echo "
$(_ak_ipfs_cat $gpg)
" + echo "
" + echo "
" + echo "
đŸ“Ļ PREVIOUS
" + echo "
" + echo ' 🔗 '$previous'' + echo "
" + echo "
đŸ“Ļ DATA
" + echo "
" + echo "
" + echo " $data" + echo "
$datablock
" + echo "
" + echo "
" + echo "
🔏 DATA_SIGNATURE
" + echo "
" + echo "
" + echo " $detach" + echo "
$(_ak_ipfs_cat $detach)
" + echo "
" + echo "
" + echo "
📄 ipfs
" + echo "
" + echo ' '🔗 $(echo $datablock | jq -r '.ipfs')'' + echo "
" + echo "
🔏 detach
" + echo "
" + echo "
" + echo " $(echo $datablock | jq -r '.detach')" + echo "
$(_ak_ipfs_cat $(echo $datablock | jq -r '.detach'))
" + echo "
" + echo "
" + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo " " + echo "
" + echo "
📃 Rendered ZBLOCK
" + echo "
" + echo "
$(cat $arg | jq)
" + echo "
" + fi + time_ended=$(date -u +%s.%N) + se=$(echo $time_ended | cut -d '.' -f 1) + nse=$(echo $time_ended | cut -d '.' -f 2) + echo "
" + echo -n " " + else + echo "$(( $nse - $(echo -n $nss|sed 's/^0*//') )) seconds" + fi + + echo "" + echo "" ) > zblock-$1.html + + rm $arg +} + +_ak_zblock_cache(){ + if [ ! -d "$AK_CACHEDIR/fzblocks" ] + then + mkdir $AK_CACHEDIR/fzblocks + fi + + if [ ! -z "$1" ] && [ -n "$1" ] + then + if [ -f "$AK_ZBLOCKDIR/$1" ] && [ "$(du -b $AK_ZBLOCKDIR/$1 | awk '{ print $1 }')" != "0" ] + then + if [ "$(sha512sum $AK_ZBLOCKDIR/$1 | awk '{ print $1 }')" == "$(_ak_zblock_show $1 | sha512sum | awk '{ print $1 }')" ] + then + logit "INFO" "Cache already there and updated" + else + logit "INFO" "Updating cache" + _ak_zblock_show "$1" > $AK_CACHEDIR/fzblocks/$1 + fi + logit "INFO" "No cache found. Caching..." + _ak_zblock_show "$1" + if [ $? -ne "0" ] + then + logit "ERROR" "_ak_zblock_show failed..." + exit 2 + fi + _ak_zblock_show "$1" > $AK_CACHEDIR/fzblocks/$1 + else + _ak_zblock_show "$1" > $AK_CACHEDIR/fzblocks/$1 + if [ $? -ne "0" ] + then + logit "ERROR" "_ak_zblock_show failed..." + exit 2 + fi + logit "ERROR" "Could not find zblock $1..." + exit 1 + fi + exit 0 + else + logit "ERROR" "No arguments..." + exit 1 + fi + +} + +_ak_zblock_pack(){ + if [ ! -z $2 ]; + then + MESSAGE="$2" + ACTION="$1" + if [ -f "$MESSAGE" ]; then + # We check firstly if the encapsulated value of the "ipfs" key has already + # appeared in the zchain. + TO_CHECK="$(cat $MESSAGE | jq | grep ipfs | awk '{print $2}' | sed -e 's/"//g;s/,//g')" + ak-enter | jq | grep ipfs | awk '{print $2}' | sed -e 's/"//g;s/,//g' | sort | uniq > tempisalreadythere + while IFS="" read -r p || [ -n "$p" ] + do + if [ "$p" == "$TO_CHECK" ] + then + logit "ERROR" "Value $TO_CHECK already mentioned on the zchain" + exit 1 + fi + done < tempisalreadythere + rm tempisalreadythere + + logit "INFO" "We are doing $ACTION with content $MESSAGE" + # We add it to IPFS + MESSAGE_HASH=$(_ak_ipfs_add $MESSAGE) + + # We create a detached and armor signature of it + MESSAGE_SIGN_FILE=$MESSAGE".asc" + _ak_gpg_sign_detached $MESSAGE_SIGN_FILE $MESSAGE + + # We add the signature to IPFS + MESSAGE_SIGNATURE=$(_ak_ipfs_add $MESSAGE_SIGN_FILE) + + # We will be using our public key also to put it in the block later + KEY="gpg.pub" + _ak_gpg_key_self_export $KEY + GPG_PUB_KEY=$(_ak_ipfs_add $KEY) + + # Acquire last block of information, to chain this one with previous posted + PREVIOUS=$(_ak_ipfs_files_stat /zlatest | head -n 1) + + # We create a block of json like this: + printf '{"timestamp":"%s","action":"%s","data":"%s","detach":"%s","gpg":"%s","previous":"%s"}' $(date -u +%s) $ACTION $MESSAGE_HASH $MESSAGE_SIGNATURE $GPG_PUB_KEY $PREVIOUS > block + BLOCK="block" + BLOCK_SIG=$BLOCK".asc" + # We have a block now, so we sign it + _ak_gpg_sign_detached $BLOCK_SIG $BLOCK + + # We now add the signature to IPFS + BLOCK_SIGNATURE=$(_ak_ipfs_add $BLOCK_SIG) + + # We also add the block! + BLOCK=$(_ak_ipfs_add $BLOCK) + + # So we now do the think almost again + printf '{"block":"%s","block_signature":"%s"}' $BLOCK $BLOCK_SIGNATURE > zblock + ZBL="zblock" + # and we add it on IPFS + ZBLOCK=$(_ak_ipfs_add $ZBL) + echo $ZBLOCK + else + logit "ERROR" "File does not exist. Aborting..." + exit 1 + fi + + # cat $PWD/zblock | jq -M + # Optional or extending with + # python send_as_ak_tx $ZBLOCK + # or for "offline" use + echo $ZBLOCK > $AK_ZLATEST + _ak_ipfs_name_publish --key=zchain $ZBLOCK > /dev/null 2>&1 + if [ $? -ne 0 ] + then + logit "ERROR" "Failed publishing ZBLOCK: $ZBLOCK" + exit 1 + fi + _ak_ipfs_files_ls /zarchive > /dev/null 2>&1 + if [ $? -ne 0 ] + then + logit "WARNING" "/zarchive does not exist" + _ak_ipfs_files_mkdir /zarchive > /dev/null 2>&1 + if [ $? -ne 0 ] + then + logit "ERROR" "Could not create /zarchive directory. Aborting." + exit 1 + fi + fi + _ak_ipfs_files_cp /zlatest /zarchive/$(date -u +%s)-$(_ak_ipfs_files_stat /zlatest | head -n 1) > /dev/null 2>&1 + if [ $? -ne 0 ] + then + logit "ERROR" "Could not back up previous /zlatest" + exit 1 + fi + _ak_ipfs_files_rm /zlatest > /dev/null 2>&1 + if [ $? -ne 0 ] + then + logit "ERROR" "Could not remove previous /zlatest" + exit 1 + fi + _ak_ipfs_files_cp /ipfs/$ZBLOCK /zlatest > /dev/null 2>&1 + if [ $? -ne 0 ] + then + logit "ERROR" "Could not copy $ZBLOCK to /zlatest" + exit 1 + fi + ak-config publish + if [ $? -ne 0 ] + then + logit "ERROR" "Could not publish new configuration" + exit 1 + fi + else + logit "ERROR" "Not enough arguments" + exit 1 + fi + +} + +_ak_zblock_announce(){ + if [ ! -z "$1" ] && [ -n "$1" ] + then + curl http://127.0.0.1:8610/v0/announce/zblock --header 'Content-Type: application/json' --data-raw '{"zblock":"'$1'"}' 2>/dev/null | jq -M -c > /dev/null + if [ $? -ne 0 ] + then + logit "ERROR" "zblock $zblock announcement failed" + else + logit "INFO" "zblock $zblock announced" + fi + else + 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 + if [ $? -ne 0 ] + then + logit "ERROR" "zblock $zblock announcement failed" + else + logit "INFO" "zblock $zblock announced" + fi + fi +} -- cgit v1.2.3