From 04a210ddbb2fe8e6ecaace25a26ade9b0741cfce Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 16 Oct 2023 22:09:34 +0200 Subject: [PATCH] refresher --- RUNTIME/UPLANET.refresh.sh | 13 ++++++++----- tools/MOATS2seconds.sh | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100755 tools/MOATS2seconds.sh diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index 6eb727f1..64260602 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -40,9 +40,10 @@ mkdir ~/.zen/tmp/${MOATS} G1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${LAT}" "${LON}") [[ ! ${G1PUB} ]] && echo "ERROR generating WALLET" && exit 1 echo "ACTUAL UMAP WALLET : ${G1PUB}" - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/WALLET.priv "${LAT}" "${LON}" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${UMAP}.priv "${LAT}" "${LON}" ipfs key rm ${G1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT - UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/WALLET.priv) + UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${UMAP}.priv) + echo "${myIPFS}/ipns/${UMAPNS}" ############################################################## # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -62,15 +63,17 @@ mkdir ~/.zen/tmp/${MOATS} mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/RSS mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/TW + echo "~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}/" ## PROTOCOL MIGRATION (TODO REMOVE) - rm ${HOME}/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/UMAP.refresh + rm ${HOME}/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/UMAP.refresh 2>/dev/null + # 8< ---- # ++++++++++++++++++++ - - - - ADAPT TO NODE TREATMENT TIME ZMOATS=$(cat ~/.zen/tmp/${MOATS}/${UMAP}/${G1PUB}/_moats 2>/dev/null) # ZMOATS SHOULD BE MORE THAT 20 HOURS. - MOATS_SECONDS=$(date -d "$MOATS" +%s) - ZMOATS_SECONDS=$(date -d "$ZMOATS" +%s) + MOATS_SECONDS=$(${MY_PATH}/../tools/MOATS2seconds.sh ${MOATS}) + ZMOATS_SECONDS=$(${MY_PATH}/../tools/MOATS2seconds.sh ${ZMOATS}) DIFF_SECONDS=$((MOATS_SECONDS - ZMOATS_SECONDS)) echo "UMAP DATA is ${DIFF_SECONDS} seconds " # IF LESS. diff --git a/tools/MOATS2seconds.sh b/tools/MOATS2seconds.sh new file mode 100755 index 00000000..67cebe42 --- /dev/null +++ b/tools/MOATS2seconds.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# ROUGHLY CONVERT MOATS IN SECONDS +MOATS=$1 +ZMOATS=${MOATS::-4} + +# Calculate ZMOATS in seconds since the epoch manually +YEAR=${ZMOATS:0:4} +MONTH=${ZMOATS:4:2} +DAY=${ZMOATS:6:2} +HOUR=${ZMOATS:8:2} +MINUTE=${ZMOATS:10:2} +SECOND=${ZMOATS:12:2} + +# Calculate the number of days in the specified month (for simplicity, assuming 30 days per month) +DAYS_IN_MONTH=30 + +# Calculate the time difference in seconds +ZMOATS_SECONDS=$((YEAR * 365 * 24 * 3600 + (MONTH - 1) * DAYS_IN_MONTH * 24 * 3600 + (DAY - 1) * 24 * 3600 + HOUR * 3600 + MINUTE * 60 + SECOND)) + +echo "$ZMOATS_SECONDS" +exit 0