axiom-team
/
astroport
9
3
Fork 1
Code Issues 13 Pull Requests 1 Releases Wiki Activity

keyname="${timestamp}_${AA}.key" + ipfs v5 compatible

This commit is contained in:
qo-op 2020-05-08 02:46:57 +02:00
parent dbd1968d56
commit 92f3a2138d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zen/ipfs_SWARM_refresh.sh
View File

@ -42,8 +42,10 @@ cd ~/
IWALLETS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
NODEIPNS=$(ipfs name publish --quieter /ipfs/$IWALLETS)
## TAKE CARE OF ~/.zen/g1sms_wallets
# GET IPNS published wallets from ALL SWARM NODES ## TODO: IF NODES are MISSING, check ./wallets_swarm/.QmNODES...
ipfs get --output=./.zen/ipfs_swarm/ /ipns/$ipfsnodeid
[[ $$ipfsnodeid ]] && ipfs get --output=./.zen/ipfs_swarm/ /ipns/$ipfsnodeid
count=1
# Search for All peers Nodes. ## TODO: To be changed when Swarm is too big or not expendanding
#for id in ./ipfs_swarm/.Qm*/; # Alternative search

2
zen/ssb_GET_zenyta.sh
View File

@ -70,7 +70,7 @@ do
CHECKSWARM=$(grep -Rwl "$timestamp" ~/.zen/ipfs_swarm/.Qm*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/')
[[ $CHECKSWARM ]] \
&& echo "$timestamp ALREADY on NODE ~/.zen/ipfs_swarm/~$CHECKSWARM CONTINUE" \
&& echo "$timestamp ALREADY on NODE $CHECKSWARM CONTINUE" \
&& echo "$timestamp" > ~/.zen/zenyta.last.ts \
&& continue

15
zen/zen_MAKE.sh
View File

@ -167,13 +167,16 @@ echo "$ISSUER" > ~/.zen/tag/${AAH}/_tag.issuer # TX ISSUER G1PUBKEY OR SSB_MESSA
# g1pub for current G1SSB Node later access...
# Using sha256sum / openssl / natools.py (libsodium)
########################################################################
[[ ! -f ~/.ipfs/keystore/${AA}.key ]] && J0=$(ipfs key gen -t rsa -s 2048 ${AA}.key)
timestamp=$(date -u +%s%N | cut -b1-13)
keyname="${timestamp}_${AA}.key"
[[ ! $(ipfs key list | grep -F ${AA}.key) ]] && J0=$(ipfs key gen -t rsa -s 2048 $keyname)
# WRITE BBH for QRCode BB verification
echo "$BBH" > ~/.zen/tag/${AAH}/_tag.BB.sha
# BB pgp symetric publishkey
openssl aes-256-cbc -pbkdf2 -k "$BB" -salt -in ~/.ipfs/keystore/${AA}.key -out ~/.zen/tag/${AAH}/_ipfs.publishkey.BB.aes
keyfilename=$(ls ~/.ipfs/keystore/ | tail -n 1)
openssl aes-256-cbc -pbkdf2 -k "$BB" -salt -in ~/.ipfs/keystore/${keyfilename} -out ~/.zen/tag/${AAH}/_ipfs.publishkey.BB.aes
# GIVE IPFS CREATOR NODE ACCESS TO ZEN TAG
$MY_PATH/tools/natools.py encrypt -p $g1pub -i ~/.ipfs/keystore/${AA}.key -o ~/.zen/tag/${AAH}/_ipfs.publishkey.crypt
$MY_PATH/tools/natools.py encrypt -p $g1pub -i ~/.ipfs/keystore/${keyfilename} -o ~/.zen/tag/${AAH}/_ipfs.publishkey.crypt
# LOG
echo "
${AA}.key
@ -209,7 +212,7 @@ echo "
CHECKSWARM=$(grep -Rwl "$ZENSOURCE" ~/.zen/ipfs_swarm/.Qm*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/')
[[ $CHECKSWARM == "" ]] && CHECKSWARM=$(grep -Rwl "$ZENSOURCE" ~/.zen/ipfs/.$ipfsnodeid/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/')
[[ -s ~/.zen/ipfs/.$ipfsnodeid/TAG/$ZENSOURCE/_tag.issuer ]] && ISSUERSWARM=$(cat ~/.zen/ipfs/.$ipfsnodeid/TAG/$ZENSOURCE/_tag.issuer)
[[ "$CHECKSWARM" != "" && "$ISSUERSWARM" == "$ISSUER" ]] && rm ~/.ipfs/keystore/${AA}.key && rm -Rf ~/.zen/tag/${AAH} \
[[ "$CHECKSWARM" != "" && "$ISSUERSWARM" == "$ISSUER" ]] && ipfs key rm $keyname && rm -Rf ~/.zen/tag/${AAH} \
&& echo "$ZENSOURCE ALREADY COPIED IN IPFS SWARM. CANCEL" && exit 1
# NO DUPLICATE
@ -303,8 +306,8 @@ I=${I}
"
# IPNS name publish
J=$(ipfs name publish -k ${AA}.key --quieter /ipfs/${I})
[[ ! ${J} ]] && echo "ipfs pin rm ${I}; ipfs pin rm ${I0}; rm -Rf ~/.zen/tag/${AAH}; rm ~/.ipfs/keystore/${AA}.key"
J=$(ipfs name publish -k $keyname --quieter /ipfs/${I})
[[ ! ${J} ]] && echo "ipfs pin rm ${I}; ipfs pin rm ${I0}; rm -Rf ~/.zen/tag/${AAH}; ipfs key rm $keyname "
[[ ! ${J} ]] && J=${J0}
echo "${J}" > ~/.zen/tag/${AAH}/_ipns