better like that

This commit is contained in:
fred 2024-01-29 16:26:17 +01:00
parent 0c074b48c0
commit 9c85c98f63
2 changed files with 48 additions and 46 deletions

View File

@ -37,7 +37,7 @@ find ~/.zen/tmp/coucou/ -mtime +1 -type f -name "${G1PUB}.g1history.json" -exec
[ $? == 0 ] && echo "Cleaning ${G1PUB}.g1history.json"
#######################################################
## IDENTIFY IF "ASTROPORT" or "COUCOU" PLAYER
## IDENTIFY IF "ASTROPORT" PLAYER
# echo "ASTROPATH ? "
ASTROPATH=$(grep $G1PUB ~/.zen/game/players/*/.g1pub | cut -d ':' -f 1 | rev | cut -d '/' -f 2- | rev 2>/dev/null)
echo $ASTROPATH
@ -49,20 +49,18 @@ fi
mkdir -p $HOME/.zen/tmp/coucou/
COINSFILE=$HOME/.zen/tmp/coucou/${G1PUB}.COINS
## GET EXTERNAL G1 DATA
${MY_PATH}/GetGCAttributesFromG1PUB.sh ${G1PUB}
# echo "ACTUAL $COINSFILE CONTAINS"
CURCOINS=$(cat $COINSFILE 2>/dev/null)
echo "$CURCOINS (G1)"
## GET EXTERNAL G1 DATA
${MY_PATH}/GetGCAttributesFromG1PUB.sh ${G1PUB} &
## NO or NULL RESULT in CACHE : REFRESHING
if [[ $CURCOINS == "" || $CURCOINS == "null" ]]; then
(
CURCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 10 ${MY_PATH}/jaklis/jaklis.py balance -p ${G1PUB})
echo "$CURCOINS" > "$COINSFILE"
# PREVENT DUNITER DESYNC (KEEPING ASTROPORT LAST KNOWN VALUE)

View File

@ -23,7 +23,7 @@ QRNS=$(${MY_PATH}/g1_to_ipfs.py ${G1PUB})
[[ ! ${MOATS} ]] && MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
mkdir -p ~/.zen/tmp/${MOATS}
COINS=$(cat ~/.zen/tmp/coucou/${G1PUB}.COINS)
COINS=$(cat ~/.zen/tmp/coucou/${G1PUB}.COINS 2>/dev/null)
ZEN=$(echo "($COINS - 1) * 10" | bc | cut -d '.' -f 1)
echo "===== ${G1PUB} ===== ${COINS} G1 / ${ZEN} ZEN"
@ -33,66 +33,70 @@ if [[ ${COINS} != "null" && $(echo "$COINS > 0" | bc -l) -eq 1 ]]; then
[[ ! -s ~/.zen/tmp/${MOATS}/${G1PUB}.g1history.json ]] \
&& ${MY_PATH}/timeout.sh -t 20 $MY_PATH/jaklis/jaklis.py history -n 100 -p ${G1PUB} -j > ~/.zen/tmp/${MOATS}/${G1PUB}.g1history.json
echo "++ HISTORY OK" >> ~/.zen/tmp/${MOATS}/response
echo "++ HISTORY OK"
fi
## SCAN GCHANGE +
${MY_PATH}/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json
GFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json | jq -r '.found')
if [[ ! -s ~/.zen/tmp/coucou/${G1PUB}.gchange.json ]]; then
${MY_PATH}/timeout.sh -t 20 curl -s ${myDATA}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json
GFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json | jq -r '.found')
if [[ $GFOUND == "false" ]]; then
echo "-- NO GCHANGE " >> ~/.zen/tmp/${MOATS}/response
if [[ $GFOUND == "false" ]]; then
echo "-- NO GCHANGE "
else
cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json ~/.zen/tmp/coucou/
echo "++ FOUND IN GCHANGE+ : $GFOUND"
[[ $COINS == "null" ]] && PALPE=10 ## 10 ZEN REWARD
fi
else
echo "++ FOUND IN GCHANGE+ : $GFOUND" >> ~/.zen/tmp/${MOATS}/response
[[ $COINS == "null" ]] && PALPE=10 ## 10 ZEN REWARD
echo "GCHANGE + : OK ~/.zen/tmp/coucou/${G1PUB}.gchange.json"
fi
## SCAN CESIUM +
${MY_PATH}/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json 2>/dev/null
GCFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json | jq -r '.found')
if [[ ! -s ~/.zen/tmp/coucou/${G1PUB}.cesium.json ]]; then
if [[ $GCFOUND == "false" ]]; then
echo "-- NO CESIUM" >> ~/.zen/tmp/${MOATS}/response
${MY_PATH}/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${G1PUB} > ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json 2>/dev/null
GCFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json | jq -r '.found')
if [[ $GCFOUND == "false" ]]; then
echo "-- NO CESIUM"
else
cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json ~/.zen/tmp/coucou/
echo "++ FOUND IN CESIUM+ : $GCFOUND"
[[ $COINS == "null" ]] && PALPE=50 ## REWARD
fi
else
echo "++ FOUND IN CESIUM+ : $GCFOUND" >> ~/.zen/tmp/${MOATS}/response
[[ $COINS == "null" ]] && PALPE=50 ## REWARD
echo "CESIUM + : OK ~/.zen/tmp/coucou/${G1PUB}.cesium.json"
fi
## CHECK IF GCHANGE IS LINKED TO "A DECLARED CESIUM"
CPLUS=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json | jq -r '._source.pubkey' 2>/dev/null)
echo "CPLUS=$CPLUS" >> ~/.zen/tmp/${MOATS}/response
## SCAN GPUB CESIUM +
if [[ ! -s ~/.zen/tmp/coucou/${G1PUB}.cplus.json ]]; then
CPLUS=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json | jq -r '._source.pubkey' 2>/dev/null)
echo "CPLUS=$CPLUS"
## SCAN GPUB CESIUM +
##### DO WE HAVE A DIFFERENT KEY LINKED TO GCHANGE ??
if [[ $CPLUS != "" && $CPLUS != 'null' && $CPLUS != $G1PUB ]]; then
##### DO WE HAVE A DIFFERENT KEY LINKED TO GCHANGE ??
if [[ $CPLUS != "" && $CPLUS != 'null' && $CPLUS != $G1PUB ]]; then
echo "SCAN GPLUS CESIUM + ACCOUNT" >> ~/.zen/tmp/${MOATS}/response
${MY_PATH}/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${CPLUS} > ~/.zen/tmp/${MOATS}/${G1PUB}.cplus.json 2>/dev/null
echo "SCAN GPLUS CESIUM + ACCOUNT"
${MY_PATH}/timeout.sh -t 10 curl -s ${myCESIUM}/user/profile/${CPLUS} > ~/.zen/tmp/${MOATS}/${G1PUB}.cplus.json 2>/dev/null
CCFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.cplus.json | jq -r '.found')
CCFOUND=$(cat ~/.zen/tmp/${MOATS}/${G1PUB}.cplus.json | jq -r '.found')
if [[ $CCFOUND == "false" ]]; then
echo "AUCUN CCPLUS : NO MEMBER LINK"
else
cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.cplus.json ~/.zen/tmp/coucou/
CPLUSCOIN=$(${MY_PATH}/COINScheck.sh ${CPLUS} | tail -n 1)
echo "${G1PUB} IS LINKED TO MEMBER ${CPLUS} POSSESSING ${CPLUSCOIN} G1"
fi
if [[ $CCFOUND == "false" ]]; then
echo "AUCUN CCPLUS : NO MEMBER LINK" >> ~/.zen/tmp/${MOATS}/response
else
CPLUSCOIN=$(${MY_PATH}/COINScheck.sh ${CPLUS} | tail -n 1)
echo "${G1PUB} IS LINKED TO MEMBER ${CPLUS} POSSESSING ${CPLUSCOIN} G1" >> ~/.zen/tmp/${MOATS}/response
fi
else
echo "MEMBER + : OK ~/.zen/tmp/coucou/${G1PUB}.cplus.json "
fi
cat ~/.zen/tmp/${MOATS}/response
## REFRESH ~/.zen/tmp/coucou/
[[ ! -s ~/.zen/tmp/coucou/${G1PUB}.g1history.json && -s ~/.zen/tmp/${MOATS}/${G1PUB}.g1history.json ]] \
&& cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.g1history.json ~/.zen/tmp/coucou/
[[ ! -s ~/.zen/tmp/coucou/${G1PUB}.gchange.json && -s ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json ]] \
&& cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.gchange.json ~/.zen/tmp/coucou/
[[ ! -s ~/.zen/tmp/coucou/${G1PUB}.cesium.json && -s ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json ]] \
&& cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.cesium.json ~/.zen/tmp/coucou/
[[ ! -s ~/.zen/tmp/coucou/${G1PUB}.cplus.json && -s ~/.zen/tmp/${MOATS}/${G1PUB}.cplus.json ]] \
&& cp -f ~/.zen/tmp/${MOATS}/${G1PUB}.cplus.json ~/.zen/tmp/coucou/
rm -Rf ~/.zen/tmp/${MOATS}/
exit 0