diff --git a/zen/ssb_INIT.sh b/zen/ssb_INIT.sh index 5b717aa..6140ee8 100755 --- a/zen/ssb_INIT.sh +++ b/zen/ssb_INIT.sh @@ -34,6 +34,7 @@ echo ' ######################################################################## # ENVIRONEMENT DETECTION + IPFS ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_info ######################################################################## +YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1); IPFSNODEID=$(ipfs id -f='\n') [[ $IPFSNODEID == "" ]] && echo "ERROR missing IPFS Node id !! IPFS is not installed !?" && exit 1 ######################################################################## @@ -45,6 +46,7 @@ G1PUB=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) [[ $G1PUB == "" ]] && echo "ERROR G1PUB empty !! Please check it..." && exit 1 ######################################################################## + # GET NODE disk performance. TODO, publish and use as IPFS repartition echo "DISK SIZE AVAILABLE & PERFORMANCE TESTING" [[ -f ~/.zen/test.disk ]] && rm -f ~/.zen/test.disk diff --git a/zen/zen_MAKE.sh b/zen/zen_MAKE.sh index 2385835..93d6083 100755 --- a/zen/zen_MAKE.sh +++ b/zen/zen_MAKE.sh @@ -36,11 +36,11 @@ echo " ############################################## # NODE ENVIRONEMENT DETECTION ############################################## -ipfsnodeid=$(ipfs id -f='\n') +IPFSNODEID=$(ipfs id -f='\n') [[ ! -f ~/.ssb/secret.dunikey ]] && $MY_PATH/tools/secret2dunikey.sh -g1pub=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) -echo "G1SSB Wallet: $g1pub -IPFS: $ipfsnodeid +G1PUB=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) +echo "G1SSB Wallet: $G1PUB +IPFS: $IPFSNODEID __ __ _ _ _______ _______ _ __ | \/ | / \ | |/ / ____| |_ / _ \ '_ \ | |\/| | / _ \ | ' /| _| @@ -156,16 +156,16 @@ CREATING ~/.zen/tag/${AAH}/ # COPY ZENTAG TO LOCAL ~/.zen/tag echo "$AA" > ~/.zen/tag/${AAH}/_tag.uid # Nom du ZenTAG echo "$ZEN" > ~/.zen/tag/${AAH}/_tag.zen # Tag ZEN amount -echo "${ipfsnodeid}" > ~/.zen/tag/${AAH}/_ipfs.node.creator # NODE IPFS ID +echo "${IPFSNODEID}" > ~/.zen/tag/${AAH}/_ipfs.node.creator # NODE IPFS ID echo "$ZENSOURCE" > ~/.zen/tag/${AAH}/_tag.zensource # ZENSOURCE -echo "$g1pub" > ~/.zen/tag/${AAH}/_g1.node.creator # CREATOR IPFS NODE G1PUBKEY +echo "$G1PUB" > ~/.zen/tag/${AAH}/_g1.node.creator # CREATOR IPFS NODE G1PUBKEY echo "$ISSUER" > ~/.zen/tag/${AAH}/_tag.issuer # TX ISSUER G1PUBKEY OR SSB_MESSAGE ID ######################################################################## # Create IPNS publishing key ${AA}.key # ===================================== # BB encrypted version for IRL use -# g1pub for current G1SSB Node later access... +# G1PUB for current G1SSB Node later access... # Using sha256sum / openssl / natools.py (libsodium) ######################################################################## #timestamp=$(date -u +%s%N | cut -b1-13) @@ -177,7 +177,7 @@ echo "$BBH" > ~/.zen/tag/${AAH}/_tag.BB.sha 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/${keyfilename} -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 @@ -211,8 +211,8 @@ echo " " # SEARCH FOR SAME SOURCE in IPFS... Not to make it twice... 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 == "" ]] && 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" ]] && ipfs key rm $keyname && rm -Rf ~/.zen/tag/${AAH} \ && echo "$ZENSOURCE ALREADY COPIED IN IPFS SWARM. CANCEL" && exit 1 # NO DUPLICATE @@ -229,7 +229,7 @@ echo " echo "$PASSENGERNAME" > ~/.zen/tag/${AAH}/_passenger.filename # G1SSB NODE ACCESS - $MY_PATH/tools/natools.py encrypt -p $g1pub -i ~/.zen/tag/${AAH}/_passenger.ipfs -o ~/.zen/tag/${AAH}/_passenger.ipfs.crypt + $MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.zen/tag/${AAH}/_passenger.ipfs -o ~/.zen/tag/${AAH}/_passenger.ipfs.crypt # BB OWNER ACCESS openssl aes-256-cbc -pbkdf2 -k "$BB" -salt -in ~/.zen/tag/${AAH}/_passenger.ipfs -out ~/.zen/tag/${AAH}/_passenger.ipfs.BB.aes @@ -275,7 +275,7 @@ echo # It is bash or javascript or python # or any language code with connection with g1, ipfs or ssb -# or Send $READ Zen to $g1pub with $PASSENGERNAME in comment +# or Send $READ Zen to $G1PUB with $PASSENGERNAME in comment # .... TODO .... # Once contract is validated @@ -322,20 +322,20 @@ J=$(ipfs name publish -k $keyname --quieter /ipfs/${I}) 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 -echo "${ZENSOURCE}" > ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/_tag.zensource -echo "${ISSUER}" > ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/_tag.issuer -echo "${J}" > ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/_tag.ipns +mkdir -p ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/ +echo "${AA}" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.uid +echo "${ZENSOURCE}" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.zensource +echo "${ISSUER}" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.issuer +echo "${J}" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.ipns if [[ "${PASSENGERNAME}" != "" ]]; then - echo "${PASSENGERNAME}" > ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/_tag.passenger.filename + echo "${PASSENGERNAME}" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.filename # COPY METADATA!! TODO : Please Extend filesource FOR new metadata types. torrent ? extractor=$(cat "$METADATA" | jq -r '.extractor') youtubeid=$(cat "$METADATA" | jq -r '.id') fulltitle=$(cat "$METADATA" | jq -r '.fulltitle') - echo "$fulltitle" > ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/_tag.passenger.fulltitle + echo "$fulltitle" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.fulltitle # description=$(cat "$METADATA" | jq -r '.description') artist=$(cat "$METADATA" | jq -r '.artist') album=$(cat "$METADATA" | jq -r '.album') @@ -344,11 +344,11 @@ if [[ "${PASSENGERNAME}" != "" ]]; then uploader_id=$(cat "$METADATA" | jq -r '.uploader_id') extractor=$(cat "$METADATA" | jq -r '.extractor') - [[ ! -f ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/_tag.passenger.metadata.${extractor}.json ]] \ + [[ ! -f ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.metadata.${extractor}.json ]] \ && cp -f "${METADATA}" /tmp/ - mv /tmp/${youtubeid}.info.json ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/_tag.passenger.metadata.${extractor}.json + mv /tmp/${youtubeid}.info.json ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.metadata.${extractor}.json fi -ls ~/.zen/ipfs/.$ipfsnodeid/TAG/${ZENSOURCE}/ +ls ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/ IWALLETS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1) NODEIPNS=$(ipfs name publish --quieter /ipfs/$IWALLETS) @@ -363,7 +363,7 @@ echo " ipfs ls /ipfs/${I} ZenTAG : ipfs ls /ipns/${J} -NODE index : ipfs ls /ipns/$ipfsnodeid/.$ipfsnodeid/TAG/${ZENSOURCE} +NODE index : ipfs ls /ipns/$IPFSNODEID/.$IPFSNODEID/TAG/${ZENSOURCE} " ######################################################################## @@ -426,7 +426,7 @@ if [[ "${PASSENGERNAME}" != "" ]]; then **ZEN=$ZEN($READ/$PARK)** [:flying_saucer:Essaim IPFS:sparkle:](http://127.0.0.1:8080/ipns/${J}/CONTRACT.sh) -[:sunglasses:**ZenTAG**:heart:DEBUG:pager:](http://127.0.0.1:8080/ipns/$ipfsnodeid/.$ipfsnodeid/TAG/${ZENSOURCE}) +[:sunglasses:**ZenTAG**:heart:DEBUG:pager:](http://127.0.0.1:8080/ipns/$IPFSNODEID/.$IPFSNODEID/TAG/${ZENSOURCE}) #zenbot #astroport