From 64c4d5af231904c41e1c6506a0bb12a6926e4f5e Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 24 Nov 2023 02:41:09 +0100 Subject: [PATCH] 1 Zen = 1 Zen --- API/QRCODE.sh | 9 ++++++++- README.md | 4 +++- RUNTIME/G1Voeu.sh | 4 ++-- RUNTIME/VISA.new.sh | 14 +++++++------- images/zenticket.png | Bin 0 -> 16073 bytes tools/RSS2UPlanetTW.sh | 5 +++-- tools/VISA.print.sh | 8 ++++---- tools/VOEUX.print.sh | 2 +- tools/make_image_ipfs_index_carousel.sh | 2 +- 9 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 images/zenticket.png diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 5068dba4..8475b893 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -277,7 +277,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then ## history & read # cp ~/.zen/tmp/${MOATS}/secret.key ~/.zen/tmp/ - qrencode -s 6 -o "${HOME}/.zen/tmp/${MOATS}/disco.qr.png" "${G1PUB}" + qrencode -s 6 -o "${HOME}/.zen/tmp/${MOATS}/disco.qr.png" "${G1PUB}:ZEN" QRURL=${myIPFS}/ipfs/$(ipfs add -q ~/.zen/tmp/${MOATS}/disco.qr.png) ONVADIRE="

~ ${CURCOINS} Ğ1

${G1PUB}

" echo "${ONVADIRE}" >> ~/.zen/tmp/${MOATS}/disco @@ -375,6 +375,13 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then fi +### THIS QRCODE IS EMAIL/PASS/PIN STYLE +if [[ ${QRCODE:0:5} == "ẑẑẑẑẑ" ]]; then + PASS=$(urldecode ${THIS}) + echo "ZENCARD UPlanet QRCODE : PIN=${PASS}" + +fi + ################################################################################ ## QRCODE = G1Milgram G1Missive PGP ENCRYPTED STRING # /?qrcode=@@@@@BEGIN%20PGP%20MESSAGE@@@@@~~jA0ECQM............... diff --git a/README.md b/README.md index 6f2d9102..d790d3b9 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,7 @@ Après l'installation, vous devriez avoir 3 nouveaux raccourcis sur votre "Burea * "Astroport" qui ouvre le portail de votre Station : http://astroport.localhost:1234 * "REC" qui permet d'enregistrer vos fichiers sur IPFS et publier leur Capusle dans votre TW +* "G1BILLET" permet de créer des ZenCard et autres QRCodes utiles ## Comment Gérer votre "Astroport" ! @@ -390,7 +391,8 @@ We choose to use "NaCl" (secret1 / secret) 2 key generation, so it is easy to un **(SECRET1/SECRET2) mixing** -* If PLAYER key is (SECRET1/SECRET2) and G1PUB and EMAIL + TW +* If PLAYER key is (SECRET1 / SECRET2) and G1PUB and EMAIL + TW + * feed key (SECRET1 / SECRET2 G1PUB) * wishes keys are (SECRET2 / WishName EMAIL) * sub-wishes are (EMAIL / G1WishName G1PUB) * wish-billets are (EMAIL_dice_words / G1WishName G1PUB) diff --git a/RUNTIME/G1Voeu.sh b/RUNTIME/G1Voeu.sh index 2ce89335..1383281d 100755 --- a/RUNTIME/G1Voeu.sh +++ b/RUNTIME/G1Voeu.sh @@ -103,8 +103,8 @@ mkdir -p ~/.zen/tmp/${MOATS} cp ~/.zen/tmp/${MOATS}/START.png ~/.zen/game/world/${VoeuName}/${WISHG1PUB}/ qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.ASTROLINK.png" "$LIBRA/ipns/$ASTRONAUTENS" - qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.G1ASTRO.png" "$G1PUB" - qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.G1WISH.png" "${WISHG1PUB}" + qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.G1ASTRO.png" "${G1PUB}:ZEN" + qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.G1WISH.png" "${WISHG1PUB}:ZEN" qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${WISHG1PUB}/QR.IPNS.png" "/ipns/${VOEUNS}" ################################# diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index ce00d984..a63f2428 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -194,7 +194,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" mkdir -p ~/.zen/game/players/${PLAYER}/ipfs/G1SSB # Prepare astrXbian sub-datastructure "DEPRECATED" - qrencode -s 12 -o ~/.zen/game/players/${PLAYER}/QR.png "$G1PUB" + qrencode -s 12 -o ~/.zen/game/players/${PLAYER}/QR.png "$G1PUB:ZEN" ## ZEN specific G1PUB QRCODE - break G1 compatibility - cp ~/.zen/game/players/${PLAYER}/QR.png ~/.zen/game/players/${PLAYER}/ipfs/QR.png echo "$G1PUB" > ~/.zen/game/players/${PLAYER}/ipfs/G1SSB/_g1.pubkey # G1SSB NOTATION (astrXbian compatible) @@ -337,8 +337,8 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" cat ${MY_PATH}/../templates/data/local.api.json | sed "s~_NID_~${WID}~g" > ~/.zen/tmp/${MOATS}/local.api.json cat ${MY_PATH}/../templates/data/local.gw.json | sed "s~_NID_~${NID}~g" > ~/.zen/tmp/${MOATS}/local.gw.json - # Create"${PLAYER}_feed" Key ! DERIVATED ! "$SALT" "$G1PUB" - ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/feed.ipfskey "$SALT" "$G1PUB" + # Create"${PLAYER}_feed" Key ! DERIVATED ! "$SALT" "$PEPPER $G1PUB" + ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/feed.ipfskey "$SALT" "$PEPPER $G1PUB" FEEDNS=$(ipfs key import "${PLAYER}_feed" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/feed.ipfskey) ## MAKE LightBeam Plugin Tiddler ${PLAYER}_feed @@ -384,7 +384,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" ############################################################################ G1TW #### MAKE G1TW [[ -s ~/.zen/G1BILLET/MAKE_G1BILLET.sh ]] && \ - ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "xastro" "$ASTRONAUTENS" "$PLAYER" + ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "${PSEUDO-xastro}" "$ASTRONAUTENS" "$PLAYER" #### MADE # BILLETNAME=$(echo "$SALT" | sed 's/ /_/g') ## # IMAGE ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.BILLET.jpg ############################################################################ @@ -393,12 +393,12 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" if [[ $(which amzqr) ]]; then GIMG="${MY_PATH}/../images/moa_net.png" - CIMG="${MY_PATH}/../images/g1ticket.png" + CIMG="${MY_PATH}/../images/zenticket.png" # QRG1avatar.png - [[ ! -s ~/.zen/game/players/${PLAYER}/QRG1avatar.png ]] && amzqr ${G1PUB} -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/ 1>/dev/null + [[ ! -s ~/.zen/game/players/${PLAYER}/QRG1avatar.png ]] && amzqr "${G1PUB}:ZEN" -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/ 1>/dev/null # QRTWavatar.png - [[ ! -s ~/.zen/game/players/${PLAYER}/QRTWavatar.png ]] && amzqr ${myIPFSGW}/ipns/$ASTRONAUTENS -l H -p "$GIMG" -c -n QRTWavatar.png -d ~/.zen/game/players/${PLAYER}/ 1>/dev/null + [[ ! -s ~/.zen/game/players/${PLAYER}/QRTWavatar.png ]] && amzqr "${myIPFSGW}/ipns/${ASTRONAUTENS}" -l H -p "$GIMG" -c -n QRTWavatar.png -d ~/.zen/game/players/${PLAYER}/ 1>/dev/null else diff --git a/images/zenticket.png b/images/zenticket.png new file mode 100644 index 0000000000000000000000000000000000000000..f7db069985329f840f5e67ca7690e068589186a1 GIT binary patch literal 16073 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 O7+J~h->SupgZ>{F3}Rsb literal 0 HcmV?d00001 diff --git a/tools/RSS2UPlanetTW.sh b/tools/RSS2UPlanetTW.sh index c1a3e95f..38c2caad 100755 --- a/tools/RSS2UPlanetTW.sh +++ b/tools/RSS2UPlanetTW.sh @@ -4,7 +4,7 @@ # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) ######################################################################## # INSERT NEW TIDDLERS FROM RSS JSON INTO UPLANET TW -# DETECTING CONFLICT WITH ON SAME TITLE +# DETECTING CONFLICT WITH SAME TITLE # ASKING TO EXISTING SIGNATURES TO UPDATE THEIR TW OR FORK TITLE ######################################################################## MY_PATH="`dirname \"$0\"`" # relative @@ -21,12 +21,13 @@ INDEX=$4 [[ ! -s ${INDEX} ]] && echo "BAD TW INDEX" && exit 1 echo "SECTOR TW INSERTING" ${RSS} +## NEW RULE. ONLY 2 SIGNATURES TIDDLERS COMES UP cat "${RSS}" | jq -r '.[] | .title' > ~/.zen/tmp/${MOATS}/titles.list while read title; do - [[ ${title} == "GettingStarted" || ${title} == "GPS" || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "ZenCard" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \ + [[ ${title} == "GettingStarted" || ${title} == "GPS" || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "G1Visa" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \ && echo "FILTERED TITLE ${title}" && continue ## CHECK FOR TIDDLER WITH SAME TITTLE IN SECTOR TW diff --git a/tools/VISA.print.sh b/tools/VISA.print.sh index 2a6b0061..3026a724 100755 --- a/tools/VISA.print.sh +++ b/tools/VISA.print.sh @@ -47,8 +47,8 @@ else PSEUDO="${PLAYER}" mkdir -p ~/.zen/game/players/${PLAYER}/ - CIMG="${MY_PATH}/../images/g1ticket.png" - amzqr ${G1PUB} -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/ + CIMG="${MY_PATH}/../images/zenticket.png" + amzqr "${G1PUB}:ZEN" -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/ fi @@ -61,8 +61,8 @@ LP=$(ls /dev/usb/lp* | head -n 1 2>/dev/null) # USE G1BILLET GENERATOR [[ -s ~/.zen/G1BILLET/MAKE_G1BILLET.sh ]] \ -&& echo ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "xastro" "$ASTRONAUTENS" "$PLAYER" \ -&& ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "xastro" "$ASTRONAUTENS" "$PLAYER" \ +&& echo ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "${PSEUDO-xastro}" "$ASTRONAUTENS" "$PLAYER" \ +&& ~/.zen/G1BILLET/MAKE_G1BILLET.sh "$SALT" "$PEPPER" "___" "$G1PUB" "${PASS}" "${PSEUDO-xastro}" "$ASTRONAUTENS" "$PLAYER" \ || ( echo "MISSING G1BILLET ENGINE - ERROR - " && exit 1 ) s=$(${MY_PATH}/diceware.sh 1 | xargs) diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh index cde8049e..95ca46fa 100755 --- a/tools/VOEUX.print.sh +++ b/tools/VOEUX.print.sh @@ -161,7 +161,7 @@ select zwish in "${vlist[@]}"; do ;; "Ğ1") - qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${voeu}/G1PUB.png" "${voeu}" + qrencode -s 12 -o "$HOME/.zen/game/world/${VoeuName}/${voeu}/G1PUB.png" "${voeu}:ZEN" convert $HOME/.zen/game/world/${VoeuName}/${voeu}/G1PUB.png -resize 600 ~/.zen/tmp/${MOATS}/START.png break ;; diff --git a/tools/make_image_ipfs_index_carousel.sh b/tools/make_image_ipfs_index_carousel.sh index 7ea43828..c83220cc 100755 --- a/tools/make_image_ipfs_index_carousel.sh +++ b/tools/make_image_ipfs_index_carousel.sh @@ -90,7 +90,7 @@ if [[ ! -d $img_dir ]]; then # CREATE G1 AMZQR - CIMG="$MY_PATH/../images/g1ticket.png" + CIMG="$MY_PATH/../images/zenticket.png" amzqr ${pub} -l H -p "$CIMG" -c -n QRG1avatar.png -d ~/.zen/game/players/${PLAYER}/ convert ~/.zen/game/players/${PLAYER}/QRG1avatar.png -resize 250 ~/.zen/tmp/QR.png # ADD IT