Zen economy activation moving ~/.zen/ipfs/.${IPFSNODEID}/PIN to ~/.zen/PIN (hidden from swarm was showing clear PIN data to every friends)

2021-03-17 16:54:15 +01:00 · 2021-03-17 16:54:15 +01:00 · 8c5130181d
parent e9b4a08ac7
commit 8c5130181d
6 changed files with 21 additions and 30 deletions
--- a/README.md
+++ b/README.md
@ -144,7 +144,7 @@ for peer in $(ipfs swarm peers); do ipfsnodeid=${peer##*/}; ipfs cat /ipns/$ipfs
 # Obtenir vos PIN IPFS
 for ID in $( ls ~/.zen/ipfs/.${IPFSNODEID}/PIN/ | cut -d '/' -f 8); do ipfs ls $ID; done

-# Lister vos fichiers transférés dans Astroport/Kodi
+# Lister vos index de fichiers visibles dans votre Kodi
 cat ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/*ASTRXBIAN

 # Lister les fichiers partagés par votre essaim d'amis
@ -153,6 +153,9 @@ cat ~/.zen/ipfs_swarm/.12D*/astroport/kodi/vstream/*ASTRXBIAN | sort | uniq
 # CODE ASTROPORT beta
 ipfs ls /ipns/k51qzi5uqu5dgfc3m379rf9820vg20hjhnmo9letrkj2p177tq013ohn68xf2y

+# Show MyCODE ipfs hash in your swarm
+for CODE in $(ls ~/.zen/ipfs_swarm/.12D*/.mycode); do ipfsnodeid=$(echo $CODE | cut -d '.' -f 3 ); code=$(cat $CODE); echo "$ipfsnodeid code is $code"; done
+
 ```

 # ANNEXES
--- a/cron_MINUTE.sh
+++ b/cron_MINUTE.sh
@ -32,6 +32,8 @@ ping -q -w 1 -c 1 `ip r | grep default | cut -d ' ' -f 3` 2>&1>/dev/null && echo
 ########################################################################
 ### TEMP CODE (add missing packages to xbian) - TODO REMOVE after 30 mn for git pull & apply
 # [[ $(which ffmpeg) == "" && "$USER" == "xbian" ]] && sudo apt-get update && sudo apt-get install git fail2ban inotify-tools curl net-tools libsodium* python3-dev python3-pip python3-setuptools python3-wheel mpack libssl-dev libffi-dev build-essential qrencode jq bc gawk ffmpeg sqlite dnsutils vlc mp3info x11-utils -y
+[[ -d ~/.zen/ipfs/.${IPFSNODEID}/PIN/ ]] && mv ~/.zen/ipfs/.${IPFSNODEID}/PIN ~/.zen/ && rm ~/.zen/PIN/${IPFSREPFILEID}/${G1PUB} # HIDDING PIN FROM SWARM
+
 ########################################################################

 ########################################################################
--- a/zen/gchange_INIT.sh
+++ b/zen/gchange_INIT.sh
@ -100,29 +100,14 @@ echo $(df ~/.ipfs/ | tail -n 1 | awk '{print $4}') > ~/.zen/ipfs/.${IPFSNODEID}/
 IamBOOTSTRAP=$(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep "$G1PUB") # AM I A BOOTSTRAP ?

 ################## AUTO PINNING 
-if [[ "$IamBOOTSTRAP" == "$G1PUB" ]]; then
-## AUTO PIN FRIENDS ACTIVATION
-# /home/fred/.zen/ipfs_swarm/.12D3KooWB2PWQegymKFGdhKGQbyvnp5RQvjFPzz6KC6sxeo3juaB/PIN/QmbkFKpmfaZyFTBNGbnsLDuaQULzLTAS5DBYHjSYVDrFen/2D2LfX7GaQynDooqn1Eb21zavbgcNJucMbjrafe9qxrF
-for ipfsfile in $(ls ~/.zen/ipfs_swarm/.*/PIN/*/* | grep -Ev ${IPFSNODEID} | cut -d '/' -f 8 | sort | uniq | shuf );
-do
-# /home/fred/.zen/ipfs_swarm/.12D3KooWB2PWQegymKFGdhKGQbyvnp5RQvjFPzz6KC6sxeo3juaB/PIN/QmbkFKpmfaZyFTBNGbnsLDuaQULzLTAS5DBYHjSYVDrFen/2D2LfX7GaQynDooqn1Eb21zavbgcNJucMbjrafe9qxrF
-	# PINNING NEW FILE 
-	astrofile=$(~/.zen/astrXbian/zen/tools/timeout.sh -t 5 ipfs ls $ipfsfile 2>/dev/null | cut -d ' ' -f 1)
-	echo  "PINNING ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astrofile} ??"
-	if [[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astrofile} && "${astrofile}" != "" ]];
-	then
-		echo "TRYING TO PIN : $astrofile"
-		~/.zen/astrXbian/zen/tools/timeout.sh -t 5 ipfs ls ${ipfsfile} && ipfs pin add --progress /ipfs/${ipfsfile} && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${ipfsfile}/ && echo "PUBLISHING MY PIN" || continue
-		[[ -d ~/.zen/ipfs/.${IPFSNODEID}/PIN/${ipfsfile} ]] && echo "0" > ~/.zen/ipfs/.${IPFSNODEID}/PIN/${ipfsfile}/$G1PUB && break
-	fi
-done
-fi
+~/.zen/astrXbian/zen/tools/autoPINfriends.sh
 ################## AUTO PINNING 


+################## CHECKING WHO GAVE ME STARS  
 for liking_me in $(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars | jq -r '.likes[].issuer' && cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#");
 do
-	# BOOTSTRAP AUTO LIKE BACK (NOT liking Myself)
+##### BOOTSTRAP AUTO LIKE BACK (NOT liking Myself)
 	if [[ "$IamBOOTSTRAP" == "$G1PUB" ]]; then
 			echo "I AM A BOOTSTRAP AUTO LIKING $liking_me FRIEND"
 			if [[  ! -f ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/tryme.addr && "$liking_me" != "$G1PUB" ]]; then
@ -134,7 +119,7 @@ do
 			fi
 	fi

-	# CHECKING IF WE LIKE EACH OTHER (AVOID LIKING MYSELF)
+##### CHECKING IF WE LIKE EACH OTHER (AVOID LIKING MYSELF)
    friend_of_mine=$(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars -p $liking_me | jq -r '.yours');
 	if [[ "$friend_of_mine" != "null" && "$liking_me" != "$G1PUB" ]]
 	then
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@ -211,8 +211,8 @@ fi
 && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN

 # MEMORIZE NEW PIN
-mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/
-touch ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/${G1PUB}
+mkdir -p ~/.zen/PIN/${IPFSREPFILEID}/
+touch ~/.zen/PIN/${IPFSREPFILEID}/${G1PUB}

 # ADD NEW LINE TO INDEX
 if [[ -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ajouter_video.txt ]]
--- a/zen/new_mp3_in_astroport.sh
+++ b/zen/new_mp3_in_astroport.sh
@ -135,8 +135,7 @@ if (( $(echo "$CONFIANCE < 0.9" | bc -l) )); then
 	echo "$NEWCOG" | jq
 fi

-# CORRECT & MEMORIZE NEW PIN
-[[ -d ~/.zen/ipfs/.${IPFSNODEID}/PIN/ ]] && mv ~/.zen/ipfs/.${IPFSNODEID}/PIN ~/.zen/ && rm ~/.zen/PIN/${IPFSREPFILEID}/${G1PUB} # HIDDING PIN FROM SWARM
+# MEMORIZE NEW PIN
 mkdir -p ~/.zen/PIN/${IPFSREPFILEID}/${IPNS}/
 touch "~/.zen/PIN/${IPFSREPFILEID}/${IPNS}/${TITLE}"
 echo "${file}" > ~/.zen/PIN/${IPFSREPFILEID}/${IPNS}/.ipfs.filename
--- a/zen/tools/autoPINfriends.sh
+++ b/zen/tools/autoPINfriends.sh
@ -11,7 +11,9 @@ YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail
 IPFSNODEID=$(ipfs id -f='<id>\n')
 G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)

-ls ~/.zen/ipfs/.${IPFSNODEID}/PIN/*/* | cut -d '/' -f 8 
+## TODO REWRITE
+exit 0
+ls ~/.zen/PIN/*/* | cut -d '/' -f 8 

 ## AUTO PIN FRIENDS ACTIVATION
 # /home/fred/.zen/ipfs_swarm/.12D3KooWB2PWQegymKFGdhKGQbyvnp5RQvjFPzz6KC6sxeo3juaB/PIN/QmbkFKpmfaZyFTBNGbnsLDuaQULzLTAS5DBYHjSYVDrFen/2D2LfX7GaQynDooqn1Eb21zavbgcNJucMbjrafe9qxrF
@ -19,17 +21,17 @@ for astrofile in $(ls ~/.zen/ipfs_swarm/.12D*/PIN/*/* | grep -Ev ${IPFSNODEID} |
 do
 # /home/fred/.zen/ipfs_swarm/.12D3KooWB2PWQegymKFGdhKGQbyvnp5RQvjFPzz6KC6sxeo3juaB/PIN/QmbkFKpmfaZyFTBNGbnsLDuaQULzLTAS5DBYHjSYVDrFen/2D2LfX7GaQynDooqn1Eb21zavbgcNJucMbjrafe9qxrF
 	# PINNING NEW FILE 
-	echo  "PINNING ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astrofile} ??"
-	if [[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astrofile} ]];
+	echo  "PINNING ~/.zen/PIN/${astrofile} ??"
+	if [[ ! -d ~/.zen/PIN/${astrofile} ]];
 	then
 		echo "PIN : $astrofile"
-		ipfs pin add /ipfs/$astrofile && mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astrofile}/
+		ipfs pin add /ipfs/$astrofile && mkdir -p ~/.zen/PIN/${astrofile}/
 		echo "PUBLISHING MY PIN"
-		[[ -d ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astrofile} ]] && echo "0" > ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astrofile}/$G1PUB
+		[[ -d ~/.zen/PIN/${astrofile} ]] && echo "0" > ~/.zen/PIN/${astrofile}/$G1PUB
 	else
 		echo "ALREADY PINNED"
 	fi
 # EXIT AFTER ONE PIN ONLY (next PIN in cron_MINUTE time)
-[[ -f ~/.zen/ipfs/.${IPFSNODEID}/PIN/${astrofile}/$G1PUB ]] && break
+[[ -f ~/.zen/PIN/${astrofile}/$G1PUB ]] && break
 done