diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index f4d76804..7e198f6e 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -48,7 +48,7 @@ echo ${SECTORS[@]} for SECTOR in ${SECTORS[@]}; do echo "SECTOR ${SECTOR}" - mkdir -p ~/.zen/tmp/${MOATS}/${SECTOR}/CHAIN + mkdir -p ~/.zen/tmp/${MOATS}/${SECTOR}/CHAIN/ ############################################################## SECTORG1PUB=$(${MY_PATH}/../tools/keygen -t duniter "${SECTOR}" "${SECTOR}") @@ -83,17 +83,20 @@ for SECTOR in ${SECTORS[@]}; do # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ## CONTROL ACTINGNODE SWAPPING UREFRESH="${HOME}/.zen/tmp/${MOATS}/${SECTOR}/CHAIN/SECTOR.refresher" - ALLNODES=($(cat ${UREFRESH} 2>/dev/null)) # ${ALLNODES[@]} + ALLNODES=($(cat ${UREFRESH} | grep -v '^[[:space:]]*$' 2>/dev/null)) # ${ALLNODES[@]} without empty line STRAPS=($(cat ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | grep -Ev "#" | rev | cut -d '/' -f 1 | rev | grep -v '^[[:space:]]*$')) ## ${STRAPS[@]} if [[ ${ALLNODES[@]} == "" ]]; then for STRAP in ${STRAPS[@]}; do - echo ${STRAP} >> ${UREFRESH} ## FILL UMAP.refresher file with all STRAPS + echo ${STRAP} >> ${UREFRESH} ## FILL SECTOR.refresher file with all STRAPS done ALLNODES=($(cat ${UREFRESH} 2>/dev/null)) # ${ALLNODES[@]} fi - ACTINGNODE=${ALLNODES[1]} ## FIST NODE IN UMAP.refresher + ACTINGNODE=${ALLNODES[0]} ## FIST NODE IN SECTOR.refresher + + ## IN CASE OLD BOOSTRAP IS STILL IN CHARGE - CHOOSE 1ST STRAP - + [[ ! $(echo ${STRAPS[@]} | grep ${ACTINGNODE}) ]] && ACTINGNODE=${STRAPS[0]} [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \ && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \ @@ -101,7 +104,7 @@ for SECTOR in ${SECTORS[@]}; do ### NEXT REFRESHER SHUFFLE for STRAP in ${STRAPS[@]}; do - echo ${STRAP} > ${UREFRESH} ## FILL UMAP.refresher file with all STRAPS + echo ${STRAP} > ${UREFRESH} ## RESET SECTOR.refresher file with actual STRAPS done # SHUFFLE UMAP.refresher cat ${UREFRESH} | sort | uniq | shuf > ${UREFRESH}.shuf @@ -123,23 +126,20 @@ for SECTOR in ${SECTORS[@]}; do RSSNODE=($(ls ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${SLAT}*_${SLON}*/RSS/*.rss.json 2>/dev/null)) NL=${#RSSNODE[@]} - for RSS in ${RSSNODE[@]}; do - - ${MY_PATH}/../tools/RSS2UPlanetTW.sh "${RSS}" "${SECTOR}" "${MOATS}" "${INDEX}" - - done - RSSWARM=($(ls ~/.zen/tmp/swarm/12D*/UPLANET/_${SLAT}*_${SLON}*/RSS/*.rss.json 2>/dev/null)) NS=${#RSSWARM[@]} - for RSS in ${RSSWARM[@]}; do + combinedrss=("${RSSNODE[@]}" "${RSSWARM[@]}") + RSSALL=($(echo "${combinedrss[@]}" | tr ' ' '\n' | sort -u)) + + for RSS in ${RSSALL[@]}; do ${MY_PATH}/../tools/RSS2UPlanetTW.sh "${RSS}" "${SECTOR}" "${MOATS}" "${INDEX}" done -############################################################## TOTL=$((${NL}+${NS})) +############################################################## echo "Number of RSS : "${TOTL} rm ~/.zen/tmp/${MOATS}/${SECTOR}/N_RSS* @@ -156,12 +156,12 @@ echo "Number of RSS : "${TOTL} ###################################################### ( - echo "PUBLISHING ${SECTOR} ${myIPFS}/ipns/${SECTORNS}" + echo "_____PUBLISHING ${SECTOR} ${myIPFS}/ipns/${SECTORNS}" start=`date +%s` ipfs name publish -k ${SECTORG1PUB} /ipfs/${IPFSPOP} ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1 end=`date +%s` - echo "(SECTOR) PUBLISH time was "`expr $end - $start` seconds. + echo "_____SECTOR${SECTOR} PUBLISH time was "`expr $end - $start` seconds. ) & ###################################################### diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index aaa859a1..321a46d0 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -106,10 +106,10 @@ mkdir ~/.zen/tmp/${MOATS} ALLNODES=($(cat ${UREFRESH} 2>/dev/null)) # ${ALLNODES[@]} fi - ACTINGNODE=${ALLNODES[1]} ## FIST NODE IN UMAP.refresher + ACTINGNODE=${ALLNODES[0]} ## FIST NODE IN UMAP.refresher ## IN CASE OLD BOOSTRAP IS STILL IN CHARGE - CHOOSE 1ST STRAP - - [[ ! $(echo ${STRAPS[@]} | grep ${ACTINGNODE}) ]] && ACTINGNODE=${STRAPS[1]} + [[ ! $(echo ${STRAPS[@]} | grep ${ACTINGNODE}) ]] && ACTINGNODE=${STRAPS[0]} echo "* ACTINGNODE=${ACTINGNODE}" diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index f5121ed9..dffc6b19 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -298,8 +298,9 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" sed -i "s~${OUMAP}~${UMAP}~g" ~/.zen/tmp/${MOATS}/GPS.json fi - SECTOR=_$(echo $LAT | xargs printf '%.1f\n' | sed s~,~.~g)_$(echo $LON | xargs printf '%.1f\n' | sed s~,~.~g) ### SECTOR = 0.1° Planet Slice in MadeInZion Tiddler + SECTOR="_${LAT::-1}_${LON::-1}" ### SECTOR = 0.1° Planet Slice in MadeInZion Tiddler echo "UPlanet 0.1° SECTOR : ${SECTOR}" + sed -i "s~_SECTOR_~${SECTOR}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ## Change myIP #~ sed -i "s~127.0.0.1~$myIP~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html # 8080 & 5001 BEING THE RECORDING GATEWAY (WAN or ipfs.localhost) diff --git a/tools/MOATS2seconds.sh b/tools/MOATS2seconds.sh index 67cebe42..41694810 100755 --- a/tools/MOATS2seconds.sh +++ b/tools/MOATS2seconds.sh @@ -1,21 +1,33 @@ #!/bin/bash # ROUGHLY CONVERT MOATS IN SECONDS MOATS=$1 +[[ ${MOATS} == "" ]] && MOATS=0 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 ZMOATS in seconds since the epoch manually +YEAR=${ZMOATS:0:4} +SECYEAR=$((YEAR * 365 * 24 * 3600)) + +MONTH=$((${ZMOATS:4:2}+0)) +SECMONTH=$((MONTH * DAYS_IN_MONTH * 24 * 3600)) + +DAY=$((${ZMOATS:6:2}+0)) +SECDAY=$((DAY * 24 * 3600)) + +HOUR=$((${ZMOATS:8:2}+0)) +SECHOUR=$((HOUR * 3600)) + +MINUTE=$((${ZMOATS:10:2}+0)) +SECMINUTE=$((MINUTE * 60)) + +SECOND=$((${ZMOATS:12:2}+0)) + + # 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)) +ZMOATS_SECONDS=$((SECYEAR + SECMONTH + SECDAY + SECHOUR + SECMINUTE + SECOND)) echo "$ZMOATS_SECONDS" exit 0 diff --git a/tools/my.sh b/tools/my.sh index 8d2b3428..8a7eed18 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -139,7 +139,7 @@ myIpfs() { } myIpfsApi() { - ipfs --api "$(cat "$(myHome)"/.ipfs/api)" swarm peers >/dev/null 2>&1 \ + ipfs --timeout 10s --api "$(cat "$(myHome)"/.ipfs/api)" swarm peers >/dev/null 2>&1 \ && local myIpfsApi=$(cat "$(myHome)"/.ipfs/api) [ -n "$myIpfsApi" ] && echo "$myIpfsApi" }