diff --git a/ANA/Readme.md b/ANA/Readme.md index 4c52088..7ee84a1 100644 --- a/ANA/Readme.md +++ b/ANA/Readme.md @@ -74,3 +74,6 @@ We are all spread thin, each community doing one cool thing in its own place, so Let's stop protocol wars and work together to progress toward our mutual vision. Let's join our efforts and invent protocols to make our systems able to communicate at the lowest level. + +## [The Map is the Territory](https://solarpunk.cool/zines/map-is-the-territory/) + diff --git a/g1sms/cron_G1TAG_REFRESH.sh b/g1sms/cron_G1TAG_REFRESH.sh index 4294bd7..272ddc0 100755 --- a/g1sms/cron_G1TAG_REFRESH.sh +++ b/g1sms/cron_G1TAG_REFRESH.sh @@ -63,7 +63,7 @@ for tag in ~/.zen/ipfs/.$IPFSNODEID/TAG/*; do echo "__SUB:cron_G1TAG_REFRESH.sh: GET PUBLISHKEY for that G1TAG"; su $YOU -c "ipfs get -o ~/.ipfs/keystore/${RR}.crypt /ipns/$tagj/TAG_publishkey.MASTER.crypt" if [[ ! -f ~/.ipfs/keystore/${RR}.crypt ]]; then log "__SUB:cron_MINUTE.sh: error getting publishkey"; continue; fi - ./natools.py decrypt --pubsec -k "$NODE_G1AUTHFILE" -i ~/.ipfs/keystore/${RR}.crypt -o ~/.ipfs/keystore/$RR + ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i ~/.ipfs/keystore/${RR}.crypt -o ~/.ipfs/keystore/$RR rm ~/.ipfs/keystore/${RR}.crypt fi echo "__SUB:cron_G1TAG_REFRESH.sh: G1Tag PUBLISHKEY OK : ~/.ipfs/keystore/${RR}" diff --git a/g1sms/functions.sh b/g1sms/functions.sh index f66f1d6..afef33a 100755 --- a/g1sms/functions.sh +++ b/g1sms/functions.sh @@ -273,7 +273,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)" ####################### # ACTIVATE G1SMS WALLET ####################### - # log "$NODE_G1AUTHFILE $PUBKEY THIRD_PARTY_MANAGER:$NODE_G1PUBKEY" + # log "$NODE_PUBSECFILE $PUBKEY THIRD_PARTY_MANAGER:$NODE_G1PUBKEY" duniter_server=$(./tools/duniter_getnode.sh) TX_IN=$(silkaj -p "$duniter_server" -af --file ~/.ssb/secret.dunikey tx --output $PUBKEY --amount 3.24 --comment "[G1sms+] $UIDNA$TAIL 3RD:$NODE_G1PUBKEY" -y) log "__SUB:sms_INIT_ACCOUNT: G1 Wallet TX IN: $TX_IN" @@ -309,7 +309,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)" # TODO make decypher less stress on filesystem, use /tmp and ramdisk echo "${IPFSPrivKey}" | gpg -d -q --output "$PINFILE" --yes --pinentry-mode loopback --passphrase-fd 0 "$GPGPINFILE" PIN=$(cat "$PINFILE" | xargs) - [[ "$PIN" == "" && -f "$PINFILE.$NODE_UIDNA.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_G1AUTHFILE" -i "$PINFILE.$NODE_UIDNA.crypt" -o "$PINFILE" && PIN=$(cat "$PINFILE"); + [[ "$PIN" == "" && -f "$PINFILE.$NODE_UIDNA.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "$PINFILE.$NODE_UIDNA.crypt" -o "$PINFILE" && PIN=$(cat "$PINFILE"); [[ "$PIN" != "" ]] && echo "" > "$PINFILE" || log "SYSTEM ERROR :: PIN EMPTY !!! GPG???" # HIDE EMAIL FILE @@ -317,7 +317,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)" log "__SUB:sms_INIT_ACCOUNT: DECODING EMAIL .gpg... " echo "${IPFSPrivKey}" | gpg -d -q --output "$MAILFILE" --yes --pinentry-mode loopback --passphrase-fd 0 "$GPGMAILFILE" MAIL=$(cat "$MAILFILE"); - [[ $MAIL == "" && -f "$MAILFILE.node.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_G1AUTHFILE" -i "$MAILFILE.node.crypt" -o "$MAILFILE" && MAIL=$(cat "$MAILFILE"); + [[ $MAIL == "" && -f "$MAILFILE.node.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "$MAILFILE.node.crypt" -o "$MAILFILE" && MAIL=$(cat "$MAILFILE"); # EMPTY CLEAR EMAIL FILE [[ $MAIL != "" ]] && echo "" > "$MAILFILE" || log "SYSTEM ERROR :: MAIL EMPTY !!! GPG???" fi diff --git a/g1sms/init_keys.sh b/g1sms/init_keys.sh index 01fcfbb..a6935fb 100755 --- a/g1sms/init_keys.sh +++ b/g1sms/init_keys.sh @@ -82,7 +82,7 @@ fi ## INIT NODE G1 PUB & PRIV KEY NODE_G1PUBKEY=$ZENG1 -NODE_G1AUTHFILE="~/.ssb/secret.dunikey" +NODE_PUBSECFILE="~/.ssb/secret.dunikey" ########################################################## # MEMORIZE NODE NANODATE EXECUTION TIME (for ntpdate regular sync) diff --git a/g1sms/tag_READ_XY.sh b/g1sms/tag_READ_XY.sh index cf15ddf..ef30add 100755 --- a/g1sms/tag_READ_XY.sh +++ b/g1sms/tag_READ_XY.sh @@ -32,7 +32,7 @@ if [[ ! -f $SWARM_G1AUTHFILE ]]; then echo "ERREUR CLEF DECHIFFRAGE!"; exit; fi ## INIT NODE G1 PUB & PRIV KEY NODE_G1PUBKEY=$(cat "${GPATH}/g1sms.preoni.pub.key") -NODE_G1AUTHFILE="${GPATH}/g1sms.preoni.priv.key" +NODE_PUBSECFILE="${GPATH}/g1sms.preoni.priv.key" if [[ ! -e "/dev/ttyACM0" ]]; then echo "Branchez votre lecteur de QR code!"; exit; fi