${HOME}/.zen/game/MY_boostrap_nodes.txt CONTROL WALLET ${UPLANETNAME} ~/.zen/ipfs/swarm.key
This commit is contained in:
parent
da9f8bb55d
commit
946ccd826a
|
|
@ -127,8 +127,8 @@ mv ~/.zen/flashmem ~/.zen/tmp/flashmem
|
|||
espeak "bootstrap refresh" > /dev/null 2>&1
|
||||
ipfs bootstrap rm --all > /dev/null 2>&1
|
||||
|
||||
[[ -s ${HOME}/.zen/MY_boostrap_nodes.txt ]] \
|
||||
&& STRAPFILE="${HOME}/.zen/MY_boostrap_nodes.txt" \
|
||||
[[ -s ${HOME}/.zen/game/MY_boostrap_nodes.txt ]] \
|
||||
&& STRAPFILE="${HOME}/.zen/game/MY_boostrap_nodes.txt" \
|
||||
|| STRAPFILE="${MY_PATH}/A_boostrap_nodes.txt"
|
||||
|
||||
for bootnode in $(cat ${STRAPFILE} | grep -Ev "#") # remove comments
|
||||
|
|
|
|||
|
|
@ -438,8 +438,8 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
|
|||
## REVEAL THE KEYS
|
||||
# G1VOEU & IPNS KEY
|
||||
[[ ${player} != "" ]] \
|
||||
&& ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/playersecret.ipfs "${player}" "G1${VoeuName} ${PLAYERORIG1}" \
|
||||
&& ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/player.secret.key "${player}" "G1${VoeuName} ${PLAYERORIG1}" \
|
||||
&& ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/playersecret.ipfs "${player}${UPLANETNAME}" "G1${VoeuName} ${PLAYERORIG1}${UPLANETNAME}" \
|
||||
&& ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/player.secret.key "${player}${UPLANETNAME}" "G1${VoeuName} ${PLAYERORIG1}${UPLANETNAME}" \
|
||||
&& G1VOEUPUB=$(cat ~/.zen/tmp/${MOATS}/player.secret.key | grep 'pub:' | cut -d ' ' -f 2)
|
||||
# INSTALL orikeyname IPNS KEY ON NODE
|
||||
IK=$(ipfs key list -l | grep -w "${orikeyname}" | cut -d ' ' -f 1 )
|
||||
|
|
@ -447,9 +447,9 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
|
|||
|
||||
## IS IT A TRANSFER ? MILGRAM G1MISSIVE
|
||||
[[ ${DESTMAIL} != "" ]] \
|
||||
&& echo "MILGRAM :: ${player} :: ${DESTMAIL}" \
|
||||
#~ && DESTG1=$(${MY_PATH}/../tools/keygen "${DESTMAIL}" "G1${VoeuName} ${PLAYERORIG1}") \
|
||||
#~ && ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/destsecret.ipfs "${DESTMAIL}" "G1${VoeuName} ${PLAYERORIG1}"
|
||||
&& echo "MILGRAM :: ${player} :: ${DESTMAIL}"
|
||||
#~ && DESTG1=$(${MY_PATH}/../tools/keygen "${DESTMAIL}${UPLANETNAME}" "G1${VoeuName} ${PLAYERORIG1}${UPLANETNAME}") \
|
||||
#~ && ${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/destsecret.ipfs "${DESTMAIL}${UPLANETNAME}" "G1${VoeuName} ${PLAYERORIG1}${UPLANETNAME}"
|
||||
|
||||
# INSTALL orikeyname IPNS KEY ON NODE
|
||||
IK=$(ipfs key list -l | grep -w "${orikeyname}" | cut -d ' ' -f 1 )
|
||||
|
|
@ -516,8 +516,8 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
|
|||
echo "export ASTROTW=${ASTROTW} ASTROG1=${ASTROG1} ASTROMAIL=${DESTMAIL} ASTROFEED=${FEEDNS}"
|
||||
|
||||
# Create Next G1 & IPNS KEY
|
||||
DESTG1PUB=$(${MY_PATH}/../tools/keygen"${DESTMAIL}" "G1${VoeuName} ${PLAYERORIG1}")
|
||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/newsecret.ipfs "${DESTMAIL}" "G1${VoeuName} ${PLAYERORIG1}"
|
||||
DESTG1PUB=$(${MY_PATH}/../tools/keygen"${DESTMAIL}${UPLANETNAME}" "G1${VoeuName} ${PLAYERORIG1}${UPLANETNAME}")
|
||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/newsecret.ipfs "${DESTMAIL}${UPLANETNAME}" "G1${VoeuName} ${PLAYERORIG1}${UPLANETNAME}"
|
||||
|
||||
orikeyname="${DESTMAIL}_${VoeuName}"
|
||||
# INSTALL NEXT IPNS KEY ON NODE
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ if [[ ${#ZENSTATIONS[@]} -ge 3 ]]; then
|
|||
done
|
||||
|
||||
## INTRODUCE NEW BOOSTRAP LIST
|
||||
cp ~/.zen/tmp/${MOATS}/new_straps.list ~/.zen/MY_boostrap_nodes.txt
|
||||
cp ~/.zen/tmp/${MOATS}/new_straps.list ~/.zen/game/MY_boostrap_nodes.txt
|
||||
#######################################################################
|
||||
|
||||
# make G1PalPay refuse not from "UPlanet Master Key" primal TX
|
||||
|
|
@ -274,9 +274,8 @@ cp ~/.zen/tmp/${MOATS}/new_straps.list ~/.zen/MY_boostrap_nodes.txt
|
|||
|
||||
## UPNAME = domain.tld
|
||||
# PACTHING Astroport.ONE code
|
||||
grep -rl --exclude-dir='.git*' 'copylaradio.com' ./ | xargs sed -i "s~copylaradio.com~${UPNAME}~g"
|
||||
|
||||
|
||||
grep -rl --exclude-dir='.git*' 'copylaradio.com' ~/.zen | xargs sed -i "s~copylaradio.com~${UPNAME,,}~g"
|
||||
rm ~/.zen/game/myswarm_secret.dunikey
|
||||
# now we add key into ~/.ipfs/swarm.key
|
||||
#~ cp $HOME/.zen/game/players/${PLAYER}/.ipfs/${UPNAME}.swarm.key ~/.ipfs/swarm.key
|
||||
# it will make IPFSNODEID restarting in private mode
|
||||
|
|
|
|||
|
|
@ -61,6 +61,42 @@ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dun
|
|||
[[ ! -s $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json ]] \
|
||||
&& echo "NO PAYMENT HISTORY.........................."
|
||||
##############################
|
||||
|
||||
## CONTROL WALLET
|
||||
########################################################################################
|
||||
if [[ ${UPLANETNAME} != "" ]]; then
|
||||
echo "UPLANET ORIGIN CONTROL"
|
||||
while read LINE; do
|
||||
|
||||
echo "${LINE}"
|
||||
JSON=${LINE}
|
||||
TXIDATE=$(echo $JSON | jq -r .date)
|
||||
TXIPUBKEY=$(echo $JSON | jq -r .pubkey)
|
||||
TXIAMOUNT=$(echo $JSON | jq -r .amount)
|
||||
COMMENT=$(echo $JSON | jq -r .comment)
|
||||
|
||||
lastTXdate=$(cat ~/.zen/game/players/${PLAYER}/.uplanet.check)
|
||||
[[ -z lastTXdate ]] && lastTXdate=0
|
||||
[[ $(cat ~/.zen/game/players/${PLAYER}/.uplanet.check) -ge $TXIDATE ]] \
|
||||
&& continue
|
||||
|
||||
[[ $(echo "$TXIAMOUNT < 0" | bc) -eq 1 ]] \
|
||||
&& echo "$TXIDATE" > ~/.zen/game/players/${PLAYER}/.uplanet.check \
|
||||
&& continue
|
||||
|
||||
echo "# CHECK FOR PRIMAL REGULAR TX in INCOMING PAYMENTS"
|
||||
# silkaj money history DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech | tail -n 3 | head -n 1
|
||||
# │ 2017-11-25 │ 5nk2qdh1…:GWD │ 200 │ 18.332 │ │
|
||||
line=$(silkaj money history $TXIPUBKEY | tail -n 3 | head -n 1)
|
||||
pub8=$(echo $line | awk -F'│' '{gsub(/[[:space:]]*/, "", $3); split($3, a, ":"); print substr(a[1], 1, 8)}')
|
||||
# pub8=$(echo $line | cut -d '│' -f 3 | cut -c 1-8)
|
||||
# PUB8= UPLANET WALLET
|
||||
|
||||
done < $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json
|
||||
fi
|
||||
|
||||
|
||||
|
||||
##########################################################
|
||||
############# CHECK FOR N1COMMANDs IN PAYMENT COMMENT
|
||||
#################################################################
|
||||
|
|
@ -105,13 +141,6 @@ while read NLINE; do
|
|||
|
||||
done < ~/.zen/tmp/${MOATS}/myN1.json
|
||||
|
||||
########################################################################################
|
||||
if [[ ${UPLANETNAME} != "" ]]; then
|
||||
echo "# CHECK FOR PRIMAL REGULAR TX in INCOMING PAYMENTS"
|
||||
# silkaj money history DsEx1pS33vzYZg4MroyBV9hCw98j1gtHEhwiZ5tK7ech | tail -n 3 | head -n 1
|
||||
|
||||
fi
|
||||
|
||||
########################################################################################
|
||||
echo "# CHECK FOR EMAILs IN PAYMENT COMMENT"
|
||||
## DEBUG ## cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/${PLAYER}.duniter.history.json | jq -r
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ mkdir -p ~/.zen/tmp/${MOATS}
|
|||
# CREATION DE LA CLEF DERIVEE "G1VOEU"
|
||||
#####################################################
|
||||
source ~/.zen/game/players/${PLAYER}/secret.june ## LE PEPPER DU PLAYER DEVIENT LE SECRET1 DU G1VOEU
|
||||
[[ ${PEPPER} ]] && echo "Using PLAYER PEPPER AS WISH SALT" && SECRET1="${PEPPER}${UPLANETNAME}" ##
|
||||
[[ ${PEPPER} ]] && echo "Using PLAYER PEPPER AS WISH SALT" && SECRET1="${PEPPER}" ##
|
||||
[[ ! ${SECRET1} ]] && SECRET1=$(${MY_PATH}/../tools/diceware.sh 12 | xargs)
|
||||
|
||||
#~ echo "${SECRET1}"
|
||||
|
|
@ -57,7 +57,7 @@ SECRET2="${VoeuName} ${PLAYER} ${SALT}" ## SECRET2 est "TitreDuVoeu PLAYER SALT"
|
|||
echo "${SECRET2}" && [[ ! ${SECRET2} ]] && echo "EMPTY SECRET2 - ERROR" && exit 1
|
||||
|
||||
echo "## keygen PLAYER DERIVATE WISH KEY"
|
||||
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/wish.dunikey "${SECRET1}" "${SECRET2}"
|
||||
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/wish.dunikey "${SECRET1}${UPLANETNAME}" "${SECRET2}${UPLANETNAME}"
|
||||
WISHG1PUB=$(cat ~/.zen/tmp/${MOATS}/wish.dunikey | grep "pub:" | cut -d ' ' -f 2)
|
||||
echo "WISHG1PUB (G1PUB) = ${WISHG1PUB}"
|
||||
[[ ${WISHG1PUB} == "" ]] && echo "EMPTY WISHG1PUB G1PUB - ERROR" && exit 1
|
||||
|
|
@ -66,7 +66,7 @@ mv ~/.zen/tmp/${MOATS}/wish.dunikey ~/.zen/game/players/${PLAYER}/voeux/${VoeuNa
|
|||
|
||||
echo "# NOUVEAU VOEU"
|
||||
mkdir -p ~/.zen/game/players/${PLAYER}/voeux/${VoeuName}/${WISHG1PUB}/
|
||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/game/players/${PLAYER}/voeux/${VoeuName}/${WISHG1PUB}/qrtw.ipfskey "${SECRET1}" "${SECRET2}"
|
||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/game/players/${PLAYER}/voeux/${VoeuName}/${WISHG1PUB}/qrtw.ipfskey "${SECRET1}${UPLANETNAME}" "${SECRET2}${UPLANETNAME}"
|
||||
ipfs key import ${WISHG1PUB} -f pem-pkcs8-cleartext ~/.zen/game/players/${PLAYER}/voeux/${VoeuName}/${WISHG1PUB}/qrtw.ipfskey
|
||||
VOEUNS=$(ipfs key list -l | grep -w "${WISHG1PUB}" | cut -d ' ' -f 1 )
|
||||
echo "/ipns/${VOEUNS}"
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ echo "## MAKE /proc/cpuinfo IPFSNODEID DERIVATED KEY ##"
|
|||
SECRET2=${IPFSNODEID}
|
||||
ipfs key rm "MySwarm_${IPFSNODEID}"
|
||||
echo "SALT=$SECRET1 && PEPPER=$SECRET2" > ~/.zen/game/myswarm_secret.june
|
||||
${MY_PATH}/tools/keygen -t ipfs -o ~/.zen/game/myswarm_secret.ipfskey "$SECRET1" "$SECRET2"
|
||||
${MY_PATH}/tools/keygen -t duniter -o ~/.zen/game/myswarm_secret.dunikey "$SECRET1" "$SECRET2"
|
||||
${MY_PATH}/tools/keygen -t ipfs -o ~/.zen/game/myswarm_secret.ipfskey "$SECRET1${UPLANETNAME}" "$SECRET2${UPLANETNAME}"
|
||||
${MY_PATH}/tools/keygen -t duniter -o ~/.zen/game/myswarm_secret.dunikey "$SECRET1${UPLANETNAME}" "$SECRET2${UPLANETNAME}"
|
||||
ipfs key import "MySwarm_${IPFSNODEID}" -f pem-pkcs8-cleartext ~/.zen/game/myswarm_secret.ipfskey
|
||||
CHAN=$(ipfs key list -l | grep -w "MySwarm_${IPFSNODEID}" | cut -d ' ' -f 1 )
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ zIp() {
|
|||
}
|
||||
|
||||
UPlanetSharedSecret() {
|
||||
UPlanetSharedSecret=$(cat ~/.zen/UPlanetSharedSecret 2>/dev/null | head -n 1 )
|
||||
UPlanetSharedSecret=$(cat ~/.zen/ipfs/swarm.key 2>/dev/null | tail -n 1 )
|
||||
[ -n "$UPlanetSharedSecret" ] && echo "$UPlanetSharedSecret" || false
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue