diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 9520eba4..8bcf7a3e 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -39,6 +39,14 @@ ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/SECTOR.priv "${SECTOR} ipfs key rm ${SECTORG1PUB} > /dev/null 2>&1 ## AVOID ERROR ON IMPORT SECTORNS=$(ipfs key import ${SECTORG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/SECTOR.priv) ############################################################## + # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + ## IPFS GET ONLINE SECTORNS + #~ mkdir ~/.zen/tmp/${MOATS}/${SECTOR} + #~ ipfs get -o ~/.zen/tmp/${MOATS}/${SECTOR}/ /ipns/${SECTORNS}/ + #~ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + #~ # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> + #~ UREFRESH="${HOME}/.zen/tmp/${MOATS}/${SECTOR}/SECTOR.refresh" ## KEY SHARING echo "" diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index d85e3637..63657134 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -57,23 +57,17 @@ mkdir ~/.zen/tmp/${MOATS} ######################################################## ## NODE SELECTION in UMAP.refresh UREFRESH="${HOME}/.zen/tmp/${MOATS}/${UMAP}/${LAT}_${LON}/UMAP.refresh" - ALLNODES=($(cat ${UREFRESH})) # ${ALLNODES[@]} - [[ ! ${ALLNODES} ]] && ALLNODES=${IPFSNODEID} + ALLNODES=($(cat ${UREFRESH} 2>/dev/null)) # ${ALLNODES[@]} - STRAPS=($(ipfs bootstrap | rev | cut -f 1 -d'/' | rev)) ## ${STRAPS[@]} - # STRAPS=($(cat ${MY_PATH}/../A_boostrap_nodes.txt | grep -Ev "#")) - IAMINBOOTSTRAP=$(echo ${STRAPS[@]} | grep ${IPFSNODEID}) - [[ ! ${IAMINBOOTSTRAP} ]] && ACTINGNODE=${ALLNODES[-1]} ## LAST NODE IN UMAP.refresh - - # PRIORITY TO BOOSTRAP - for NODE in ${ALLNODES[@]}; do + if [[ ! ${ALLNODES} ]]; then # UPDATE BOOSTRAP UREFRESH LIST + STRAPS=($(ipfs bootstrap | rev | cut -f 1 -d'/' | rev)) ## ${STRAPS[@]} for STRAP in ${STRAPS[@]}; do - echo ${STRAP} >> ${UREFRESH} ## FILL UMAP.refresh file with all STRAPS - [[ "${NODE}" == "${STRAP}" ]] && ACTINGNODE=${NODE} ## PREFER NODE BEING BOOSTRAP + echo ${STRAP} >> ${UREFRESH} ## FILL UMAP.refresh file with all STRAPS done - done + ALLNODES=($(cat ${UREFRESH} 2>/dev/null)) # ${ALLNODES[@]} + fi - [[ ! ${ACTINGNODE} ]] && ACTINGNODE=${IPFSNODEID} + ACTINGNODE=${ALLNODES[-1]} ## LAST NODE IN UMAP.refresh [[ "${ACTINGNODE}" != "${IPFSNODEID}" ]] \ && echo ">> ACTINGNODE=${ACTINGNODE} is not ME - CONTINUE -" \ @@ -85,8 +79,10 @@ mkdir ~/.zen/tmp/${MOATS} ## NEXT REFRESHER # TODO: INTRODUCE NODE BALANCE AND CHOOSE THE MOST CONFIDENT ONE # SHUFFLE UMAP.refresh - echo ${IPFSNODEID} >> ${UREFRESH} - cat ${UREFRESH} | uniq | shuf > ${UREFRESH}.shuf + for STRAP in ${STRAPS[@]}; do + echo ${STRAP} >> ${UREFRESH} ## FILL UMAP.refresh file with all STRAPS + done + cat ${UREFRESH} | sort | uniq | shuf > ${UREFRESH}.shuf mv ${UREFRESH}.shuf ${UREFRESH} ## NEXT REFRESHER echo ">> NEXT REFRESHER WILL BE $(cat ${UREFRESH} | tail -n 1)"