diff --git a/zen/zen_MAKE.sh b/zen/zen_MAKE.sh index 6e0c92e..c50da9e 100755 --- a/zen/zen_MAKE.sh +++ b/zen/zen_MAKE.sh @@ -60,7 +60,7 @@ IPFS: $ipfsnodeid # _ipfs.node.creatorcat # NODE IPFS ID # _ipfs.publishkey.BB.aes # BB SYMcypher of IPNS publish key # _ipfs.publishkey.crypt # G1SSB ASYMcypher of IPNS publish key -# _tag.BB.sha # BB sha512sum +# _tag.BB.sha # BB sha256sum # _tag.uid # ZenTag UID # _tag.zen # ZentTag balance # _ipns # /ipns/ address @@ -129,9 +129,9 @@ while [[ $(grep -Rwl "$AA" ~/.zen/ipfs_swarm/.Qm*/TAG/*/_tag.uid) ]]; do done # BB key is a 4 word diceware printed on QRCode for Human use. -# SHA512 PASSWORD CHECK FOR ALLOWING WRITE ACTION +# SHA256 PASSWORD CHECK FOR ALLOWING WRITE ACTION BB=$($MY_PATH/tools/diceware.sh 4 | xargs); -BBH=$(echo -n "$BB" | sha512sum | cut -d ' ' -f 1) +BBH=$(echo -n "$BB" | sha256sum | cut -d ' ' -f 1) ######################################################################## # INITIAL DATA STRUCTURE @@ -164,9 +164,9 @@ echo "$ISSUER" > ~/.zen/tag/${AAH}/_tag.issuer # TX ISSUER G1PUBKEY OR SSB_MESSA # ===================================== # BB encrypted version for IRL use # g1pub for current G1SSB Node later access... -# Using sha512sum / openssl / natools.py (libsodium) +# Using sha256sum / openssl / natools.py (libsodium) ######################################################################## -[[ ! -f ~/.ipfs/keystore/${AA}.key ]] && J=$(ipfs key gen -t rsa -s 2048 ${AA}.key) +[[ ! -f ~/.ipfs/keystore/${AA}.key ]] && ipfs key gen -t rsa -s 2048 ${AA}.key # WRITE BBH for QRCode BB verification echo "$BBH" > ~/.zen/tag/${AAH}/_tag.BB.sha # BB pgp symetric publishkey @@ -288,18 +288,20 @@ echo " _|_ _.o._ (_| |(_||| | : $NANODATE : 0 " -I=$(ipfs add -qr ~/.zen/tag/${AAH} | tail -n 1) -echo "${I}" > ~/.zen/tag/${AAH}/_chain +I0=$(ipfs add -qr ~/.zen/tag/${AAH} | tail -n 1) +echo "${I0}" > ~/.zen/tag/${AAH}/_chain # Double IPFS add for _chain INIT -I=$(ipfs add -qr ~/.zen/tag/${AAH} | tail -n 1) cp -f ~/.zen/tag/${AAH}/_chain ~/.zen/tag/${AAH}/_chain.prev +I=$(ipfs add -qr ~/.zen/tag/${AAH} | tail -n 1) echo "${I}" > ~/.zen/tag/${AAH}/_chain # IPNS name publish J=$(ipfs name publish -k ${AA}.key --quieter /ipfs/${I}) -echo "${J}" > ~/.zen/tag/${AAH}/_ipns +[[ ! ${J} ]] && echo "Problem publishing" && exit 1 +# ipfs pin rm ${I} && ipfs pin rm ${I0} && rm -Rf ~/.zen/tag/${AAH} && rm ~/.ipfs/keystore/${AA}.key +echo "${J}" > ~/.zen/tag/${AAH}/_ipns # INDEXING ZenTag into SWARM mkdir -p ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/ echo "${AA}" > ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/_tag.uid @@ -338,9 +340,9 @@ echo " / / /_/ / __(__ ) /_/ .___/_/ /____/ /_/ -ipfs ls /ipfs/$I +ipfs ls /ipfs/${I} -ZenTAG : ipfs ls /ipns/$J +ZenTAG : ipfs ls /ipns/${J} NODE index : ipfs ls /ipns/$NODEIPNS/.$ipfsnodeid/TAG/${ZENSOURCE} "