ZEN + /ANA

This commit is contained in:
qo-op 2020-03-19 13:09:54 +01:00
parent 5452be35ac
commit 29f1fedfef
3 changed files with 67 additions and 67 deletions

View File

@ -9,42 +9,35 @@ It as a swarm of Nodes spread accross Internet networks. Each loading a fat stac
+ SCUTTLEBUTT Pubs for Machine & Human social interactions + SCUTTLEBUTT Pubs for Machine & Human social interactions
+ IPFS Nodes for File Storage, public, private and Zen accounting + IPFS Nodes for File Storage, public, private and Zen accounting
| [EN](01.home/default.en.md) | [ES](01.home/default.es.md) | [FR](01.home/default.fr.md) | [DE](01.home/default.de.md) | [IT](01.home/default.it.md) | [PL](01.home/default.pl.md) | [RU](01.home/default.ru.md) | [PT](01.home/default.pt.md) | [NL](01.home/default.nl.md) |
| [METAVERS](02.metaverse/default.en.md) | [METAVERS](02.metaverse/default.es.md) | [METAVERS](02.metaverse/default.fr.md) | [METAVERS](02.metaverse/default.de.md) | [METAVERS](02.metaverse/default.it.md) | [METAVERS](02.metaverse/default.pl.md) | [METAVERS](02.metaverse/default.ru.md) | [METAVERS](02.metaverse/default.pt.md) | [METAVERS](02.metaverse/default.nl.md) |
## Chose which metaverse you want to live in :
## EN | Panoptikon | Anoptikon |
[HOME](01.home/default.en.md) |:------------------------------------- |:---------------------------------- |
[METAVERS](02.metaverse/default.en.md) | Datacenter | P2P |
| Web 3.0 | Web 4D |
| Web for them | Web for thee |
| pseudo-gratuity | data sovereignty |
| forced march towards their technology | free from adopting or not adopting |
| "_high tech_" | relevant tech |
| things-centric | human-centric |
| Facebook | Scuttlebutt |
| Google Cloud | Nextcloud |
| Minecraft | Minetest |
## ES ## We can take back sovereignty :
[HOME](01.home/default.es.md)
[METAVERS](02.metaverse/default.es.md)
## FR | Media | Money | Politics |
[HOME](01.home/default.fr.md) | -------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- | -------- |
[METAVERS](02.metaverse/default.fr.md) | Grow your own data garden, share multimedia in private ipfs swarm of friends. Don't depend on Datacenters or even Internet anymore. Depend on YOU! | Take back money creation from the banks using a [libre currency](https://libre-currency.org/). | Get your Scuttlebutt(s), Freedom and sovereignty. Focus your mind. Activate friends collective intelligence making your self data mining. |
| IPFS | Duniter | Scuttlebutt |
## DE ## Let's code freedom!
[HOME](01.home/default.de.md)
[METAVERS](02.metaverse/default.de.md)
## IT We are all spread thin, each community doing one cool thing in its own place, sometimes reinventing the wheel, altough the technology is often already here.
[HOME](01.home/default.it.md)
[METAVERS](02.metaverse/default.it.md)
## PL
[HOME](01.home/default.pl.md)
[METAVERS](02.metaverse/default.pl.md)
## RU
[HOME](01.home/default.ru.md)
[METAVERS](02.metaverse/default.ru.md)
## PT
[HOME](01.home/default.pt.md)
[METAVERS](02.metaverse/default.pt.md)
## NL
[HOME](01.home/default.nl.md)
[METAVERS](02.metaverse/default.nl.md)
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.

View File

@ -21,13 +21,6 @@
######################################################################## ########################################################################
me=`basename "$0"` me=`basename "$0"`
# Symetric Encrypt and decrypt
# openssl aes-256-cbc -k $mysecretpassword -salt -in file -out file.aes
# openssl aes-256-cbc -k $mysecretpassword -d -salt -in file.aes -out file
# tar zip and encrypt a whole directory
# tar -zcf - directory | openssl aes-128-cbc -salt -out directory.tar.gz.aes # Encrypt
# openssl aes-128-cbc -d -salt -in directory.tar.gz.aes | tar -xz -f - # Decrypt
if [[ ! $(which silkaj) ]]; then if [[ ! $(which silkaj) ]]; then
echo "$USER please Install SILKAJ !!" && exit 1 echo "$USER please Install SILKAJ !!" && exit 1
fi fi
@ -37,9 +30,9 @@ DUNITERURL="https://$(./duniter_getnode.sh)"
IPFSNODEID=$(ipfs id -f='<id>\n') IPFSNODEID=$(ipfs id -f='<id>\n')
[[ $IPFSNODEID == "" ]] && echo "$USER Please Install IPFS !!" && exit 1 [[ $IPFSNODEID == "" ]] && echo "$USER Please Install IPFS !!" && exit 1
[[ ! -d ~/.zen/scan ]] && mkdir -p ~/.zen/scan [[ ! -d ~/.zen/scan ]] && mkdir -p ~/.zen/scan # Directory containing G1 blockchain incoming TX Scan
[[ ! -d ~/.zen/wallets ]] && mkdir -p ~/.zen/wallets [[ ! -d ~/.zen/wallets ]] && mkdir -p ~/.zen/wallets # Directory where NODE store SMS & other Channel Wallets
[[ ! -d ~/.zen/wallets_swarm ]] && mkdir -p ~/.zen/wallets_swarm [[ ! -d ~/.zen/wallets_swarm ]] && mkdir -p ~/.zen/wallets_swarm # Local copy of all SSB friends IPFS Nodes published wallets
######################################################################################################### #########################################################################################################
# GET G1 PUBKEY FROM SCUTTLEBUTT or $2 (DEBUG) # GET G1 PUBKEY FROM SCUTTLEBUTT or $2 (DEBUG)
@ -107,7 +100,7 @@ if [[ $DELAYUNIT != "minutes" && $DELAYUNIT != "minute" ]]; then
COMMENT=$(cat ~/.zen/g1zen.scan | jq '.history.received' | jq -r '.[].comment' | head -n $line | tail -n 1) COMMENT=$(cat ~/.zen/g1zen.scan | jq '.history.received' | jq -r '.[].comment' | head -n $line | tail -n 1)
# echo "TX-IN $ISSUER => $NODE_G1PUBKEY" # echo "TX-IN $ISSUER => $NODE_G1PUBKEY"
echo "TX/IN :: $ZEN ZEN from $ISSUER :: $COMMENT ($TXhash)" echo "TX/IN :: $ZEN ZEN from $ISSUER :: $COMMENT ($TXhash)"
CMD=$(echo "$TEXT" | awk '{print toupper($1)}') CMD=$(echo "$COMMENT" | awk '{print toupper($1)}')
###### CREATE ZEN VALUE IN IPFS ######### ###### CREATE ZEN VALUE IN IPFS #########
[[ $CMD == "ZEN" ]] && ./zen_MAKE.sh $ZEN $TXhash $ISSUER [[ $CMD == "ZEN" ]] && ./zen_MAKE.sh $ZEN $TXhash $ISSUER
############################################ ############################################
@ -140,9 +133,9 @@ else
COMMENT=$(cat ~/.zen/g1zen.scan | jq '.history.pending' | jq -r '.[].comment' | head -n $line | tail -n 1) COMMENT=$(cat ~/.zen/g1zen.scan | jq '.history.pending' | jq -r '.[].comment' | head -n $line | tail -n 1)
# echo "TX-IN $ISSUER => $NODE_G1PUBKEY" # echo "TX-IN $ISSUER => $NODE_G1PUBKEY"
echo "TX/IN :: $ZEN ZEN from $ISSUER :: $COMMENT ($TXhash)" echo "TX/IN :: $ZEN ZEN from $ISSUER :: $COMMENT ($TXhash)"
CMD=$(echo "$TEXT" | awk '{print toupper($1)}') CMD=$(echo "$COMMENT" | awk '{print toupper($1)}')
###### CREATE ZEN VALUE IN IPFS ######### ###### CREATE ZEN VALUE IN IPFS #########
[[ $CMD == "ZEN" ]] && ./zen_MAKE.sh $ZEN $TXhash [[ $CMD == "ZEN" ]] && ./zen_MAKE.sh $ZEN $TXhash $ISSUER
############################################ ############################################
echo "DEBUG! ./zen_MAKE.sh $ZEN $TXhash $ISSUER" echo "DEBUG! ./zen_MAKE.sh $ZEN $TXhash $ISSUER"
############################################ ############################################

View File

@ -1,5 +1,4 @@
#!/bin/bash #!/bin/bash
# TODO CLEAN IPFS: ipfs pin ls -q --type recursive | xargs ipfs pin rm
########################################################################################### ###########################################################################################
# Script appelé depuis zen_G1TXIN pour créer des QRCode IPNS + Clef associé à un ZenTag # Script appelé depuis zen_G1TXIN pour créer des QRCode IPNS + Clef associé à un ZenTag
# rempli des centimes de June reçues.# # rempli des centimes de June reçues.#
@ -21,32 +20,47 @@
# QmXA1zSxA3dh1dxFtkKaH5iomN3BsKMSAo2qhruA58AU81 34 _tag.uid # QmXA1zSxA3dh1dxFtkKaH5iomN3BsKMSAo2qhruA58AU81 34 _tag.uid
# QmPrumas2N5DuwcqUz9mayAU6oDL2bLjhpkVZ8hCRq9rpx 5 _tag.zen # QmPrumas2N5DuwcqUz9mayAU6oDL2bLjhpkVZ8hCRq9rpx 5 _tag.zen
########################################################################################### ###########################################################################################
# Symetric Encrypt and Decrypt
# openssl aes-256-cbc -k "$BB" -salt -in file -out file.aes
# openssl aes-256-cbc -k "$BB" -d -salt -in file.aes -out file
# tar zip and encrypt a whole directory
# tar -zcf - directory | openssl aes-128-cbc -salt -out directory.tar.gz.aes # Encrypt
# openssl aes-128-cbc -d -salt -in directory.tar.gz.aes | tar -xz -f - # Decrypt
########################################################################################### ###########################################################################################
me=`basename "$0"` # To clean your IPFS repo:
# ipfs pin ls -q --type recursive | xargs ipfs pin rm
###########################################################################################
me=`basename "$0"` # Script name
ZEN="$1" # Initial Zen amount
TXhash="$2" # Contains G1 TX HASH
File="$3" # Contains G1 TX HASH
ZEN=$1 [[ ! -f ~/.zen/scan/zen.$TXhash ]] && echo "ERROR Unknown TX... EXIT" && exit 1
TXhash=$2 ISSUER=$(cat ~/.zen/scan/zen.$TXhash) # Get G1 wallet issuer pubkey
[[ ! -f ~/.zen/scan/zen.$TXhash ]] && echo "TX/IN NON RECONNUE... ARRET" && exit [[ $ISSUER == "" ]] && echo "# NO SCANNED TX.... PLEASE USE ./zen_G1TXtoZenTag.sh" && exit 1
ISSUER=$(cat ~/.zen/scan/zen.$TXhash)
######################################################################################################### #########################################################################################################
IPFSNODEID=$(ipfs id -f='<id>\n') IPFSNODEID=$(ipfs id -f='<id>\n')
if [[ -f ~/.ipfs/g1.pubsec.dunikey ]]; then #########################################################################################################
NODE_G1PUBKEY=$(cat ~/.ipfs/g1.pubsec.dunikey | grep 'pub:' | cut -d ' ' -f 2)
#########################################################################################################
if [[ -f ~/.ssb/secret.dunikey ]]; then
NODE_G1PUBKEY=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
else else
echo "MISSING NODE_G1PUBKEY ~/.ipfs/g1.pubsec.dunikey ... Ciao" echo "MISSING your G1 KEY ~/.ssb/secret.dunikey ... Please run ./secret2dunikey.sh ... Ciao"
exit exit 1
fi fi
#########################################################################################################
######################################################################################################### #########################################################################################################
# CREATE ZEN TAG # CREATE ZEN TAG
# ZenTag NAMES # ZenTag NAMES
AA=$(./diceware.sh 6 | xargs); # Nom = Diceware de 6 mots AA=$(./diceware.sh 6 | xargs); # ZenTag Name = Diceware 6 words
SHAA=$(echo -n $AA | sha256sum | cut -d ' ' -f 1) SHAA=$(echo -n $AA | sha256sum | cut -d ' ' -f 1) # ZenTag Name SHA256
RR=$(echo ${AA} | sed s/\ //g ); # Nom concaténé RR=$(echo ${AA} | sed s/\ //g ); # Name without space
PR=$(echo ${AA} | cut -d ' ' -f 1 ); # Prénom du G1Tag PR=$(echo ${AA} | cut -d ' ' -f 1 ); # ZenTag short name
# Create Unique G1tag in all SWARM! TODO BETTER # Create Unique Zentag in all IPFS SWARM! TODO CHANGE METHOD
while [[ -f ~/.zen/tag/${SHAA} ]]; do while [[ -f ~/.zen/tag/${SHAA} ]]; do
AA=$(./diceware.sh 6 | xargs); AA=$(./diceware.sh 6 | xargs);
SHAA=$(echo -n $AA | sha256sum | cut -d ' ' -f 1) SHAA=$(echo -n $AA | sha256sum | cut -d ' ' -f 1)
@ -57,17 +71,17 @@ fi
# PASSWORD FOR HUMAN ACTION # PASSWORD FOR HUMAN ACTION
BB=$(./diceware.sh 4 | xargs); BB=$(./diceware.sh 4 | xargs);
SHABB=$(echo -n "$BB" | sha256sum | cut -d ' ' -f 1) SHABB=$(echo -n "$BB" | sha256sum | cut -d ' ' -f 1)
#################### ##################################################################################
# WRITE ZENTAG # CREATE ZENTAG FILES DATA STRUCTURE (TODO: Convert into yaml or json if you like)
mkdir -p ~/.zen/tag/${SHAA} mkdir -p ~/.zen/tag/${SHAA}
echo "CREATING ZenTag ($ZEN zen): ls -al ~/.zen/tag/${SHAA}" echo "CREATING ZenTag, Value = $ZEN Zen (ls -al ~/.zen/tag/${SHAA})"
echo "$AA | $BB" echo "Name: $AA | Key: $BB"
# ZenTag Create files # ZenTag Create files
echo "$AA" > ~/.zen/tag/${SHAA}/_tag.uid # Nom du ZenTAG echo "$AA" > ~/.zen/tag/${SHAA}/_tag.uid # Nom du ZenTAG
echo "$ZEN" > ~/.zen/tag/${SHAA}/_tag.zen # Tag ZEN amount echo "$ZEN" > ~/.zen/tag/${SHAA}/_tag.zen # Tag ZEN amount
echo "${IPFSNODEID}" > ~/.zen/tag/${SHAA}/_ipfs.creator # NODE IPFS ID echo "${IPFSNODEID}" > ~/.zen/tag/${SHAA}/_ipfs.node.creator # NODE IPFS ID
echo "$TXhash" > ~/.zen/tag/${SHAA}/_g1.txhash # HASH G1 TX/IN echo "$TXhash" > ~/.zen/tag/${SHAA}/_g1.txhash # HASH G1 TX/IN
echo "$NODE_G1PUBKEY" > ~/.zen/tag/${SHAA}/_g1.creator # CREATOR IPFS NODE G1PUBKEY echo "$NODE_G1PUBKEY" > ~/.zen/tag/${SHAA}/_g1.node.creator # CREATOR IPFS NODE G1PUBKEY
echo "$ISSUER" > ~/.zen/tag/${SHAA}/_g1.issuer # TX ISSUER G1PUBKEY echo "$ISSUER" > ~/.zen/tag/${SHAA}/_g1.issuer # TX ISSUER G1PUBKEY
#################################################### ####################################################
@ -102,11 +116,11 @@ fi
echo "ZENTAG MADE: ipfs ls /ipns/${J}" echo "ZENTAG MADE: ipfs ls /ipns/${J}"
ipfs ls /ipns/${J} ipfs ls /ipns/${J}
#################################################################################### ####################################################################################
### G1TAG PRINT ### G1TAG PRINT TYPE:DATA:IPNS
# QR CODE LECTURE # QR CODE LECTURE
qrencode -s 5 -o ~/.zen/tag/${SHAA}/.QRCODE.pub.png "RJ:${SHAA}#${J}" qrencode -s 5 -o ~/.zen/tag/${SHAA}/.QRCODE.pub.png "RJ:${SHAA}#${J}"
# QR CODE ECRITURE + ISSUER CYPHER (TODO : SHABB ou BB?) # QR CODE ECRITURE + ISSUER CYPHER (TODO : SHABB ou BB?)
qrencode -s 5 -o ~/.zen/tag/${SHAA}/.QRCODE.priv.png "BJ:${SHABB}#${J}" qrencode -s 5 -o ~/.zen/tag/${SHAA}/.QRCODE.priv.png "BJ:${BB}#${J}"
############################################################################## ##############################################################################
# TODO: PRINT LOCAL OR SEND "PRINT TASK" TO DAB MACHINE $ISSUER PREFERING ... # TODO: PRINT LOCAL OR SEND "PRINT TASK" TO DAB MACHINE $ISSUER PREFERING ...