Fix loopWalletUp By Matograine; Add cache for loopWalletUp
This commit is contained in:
parent
583ac799fe
commit
47fd650d80
|
|
@ -1,2 +1,3 @@
|
|||
.env
|
||||
renameHistory.sh
|
||||
cache
|
||||
|
|
|
|||
147
g1-stats.sh
147
g1-stats.sh
|
|
@ -14,18 +14,14 @@ if [[ -e $SCRIPTPATH/.env ]]; then source $SCRIPTPATH/.env; else echo "Veuillez
|
|||
startTime=$(date +'%H:%M')
|
||||
day=$(date +'%y-%m-%d')
|
||||
dayP=$(date +'%d-%m-%y')
|
||||
id=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
|
||||
indexhtml="$WEBPATH/index.html"
|
||||
echo -e "\n############# $day à $startTime #############\n"
|
||||
[[ -z $(which jq) || -z $(which bc) ]] && apt update && apt install jq bc
|
||||
echo "Initialisation ..."
|
||||
outFile="/tmp/g1-stats-$day-$startTime_$id"
|
||||
TXBLOCKS=$(curl -s ${DUNITER}/blockchain/with/tx | jq '.result.blocks[]')
|
||||
#TXBLOCKS+=$(curl -s ${DUNITER2}/blockchain/with/tx | jq '.result.blocks[]')
|
||||
#TXBLOCKS+=$(curl -s ${DUNITER3}/blockchain/with/tx | jq '.result.blocks[]')
|
||||
TXBLOCKS=($(echo "$TXBLOCKS" | sort -hu | awk '{printf $1" "}'))
|
||||
unset 'TXBLOCKS[${#TXBLOCKS[@]}-1]'
|
||||
MEMBERS=($(curl -s ${DUNITER}/wot/members | jq '.results[].pubkey' | tr -d '"'))
|
||||
MEMBERS=($(curl -s ${DUNITER}/wot/members | jq -r '.results[].pubkey'))
|
||||
nbrMembers=${#MEMBERS[@]}
|
||||
lastBloc=${TXBLOCKS[-1]}
|
||||
isWeb=$1
|
||||
|
|
@ -33,59 +29,73 @@ isWeb=$1
|
|||
### Extraction des adresses Ḡ1 actives ###
|
||||
|
||||
loopWalletUp() {
|
||||
for i in ${TXBLOCKS[*]}; do
|
||||
[[ -z ${TXBLOCKS[$i]} ]] && break
|
||||
sleep 0.1
|
||||
WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]})
|
||||
until WALLETS=$(echo $WALLETS0 | jq '.transactions[].outputs[]' 2>/dev/null); do
|
||||
local iter=0
|
||||
local REGEX_PUBKEYS="[a-zA-Z0-9]{42,44}"
|
||||
|
||||
if ls $SCRIPTPATH/cache/walletsUp-* > /dev/null 2>&1; then
|
||||
local startFile=$(ls $SCRIPTPATH/cache/walletsUp-* | tail -n1)
|
||||
local startBloc=$(echo "$startFile" | awk -F '-' '{ print $NF }')
|
||||
wallets=$(cat "$startFile")$'\n'
|
||||
local iter=$startBloc
|
||||
rm $startFile
|
||||
else
|
||||
local startBloc=0
|
||||
local iter=0
|
||||
fi
|
||||
|
||||
for i in ${TXBLOCKS[*]:$startBloc}; do # pour tout n° de bloc listé dans TXBLOCKS
|
||||
sleep 0.02
|
||||
local WALLETS0=$(curl -s ${DUNITER}/blockchain/block/$i)
|
||||
until local WALLETS=$(echo $WALLETS0 | jq -r '.transactions[].outputs[]' 2>/dev/null | grep "SIG" | grep -Eo $REGEX_PUBKEYS); do
|
||||
[[ $isWeb != "web" ]] && echo -e "iter $iter \n$WALLETS0"
|
||||
sleep 2
|
||||
WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]})
|
||||
WALLETS0=$(curl -s ${DUNITER}/blockchain/block/$i)
|
||||
done
|
||||
[[ -z "$WALLETS" ]] && echo "Erreur: $RET" && exit 1
|
||||
WALLETS=$(echo "$WALLETS" | tr -d '"' | awk -F '(' '{ print $2 }' | tr -d ')')
|
||||
|
||||
bloc=${TXBLOCKS[$i]}
|
||||
[[ -z "$WALLETS" ]] && continue
|
||||
wallets+=$(echo -e "$WALLETS \n" | sed 's/ /\\n/g')
|
||||
|
||||
progress=$(echo "scale=1; $bloc*100/$lastBloc/1" | bc)
|
||||
|
||||
|
||||
local progress=$(echo "scale=1; $i*100/$lastBloc/1" | bc)
|
||||
if [[ $isWeb != "web" ]]; then
|
||||
clear
|
||||
echo "Heure de début: $startTime"
|
||||
echo
|
||||
echo "Scan en cours: $progress% - $bloc/$lastBloc"
|
||||
echo "Scan en cours: $progress% - $i/$lastBloc"
|
||||
fi
|
||||
|
||||
((iter++))
|
||||
|
||||
echo $iter; [[ $iter -ge 25 ]] && break #kopa
|
||||
done
|
||||
|
||||
# On supprime les doublons et les lignes vides
|
||||
wallets=$(echo -e "$wallets" | sort -u | awk 'NF')
|
||||
# On écrit les pubkeys avec transaction dans un fichier de cache pour la prochaine itération
|
||||
((iter--))
|
||||
[[ ! -d $SCRIPTPATH/cache ]] && mkdir $SCRIPTPATH/cache
|
||||
echo "$wallets" > $SCRIPTPATH/cache/walletsUp-$iter
|
||||
}
|
||||
loopWalletUp
|
||||
|
||||
### Ecriture des adresses actives dans un fichier tampon ###
|
||||
echo -e "$(echo -e "$wallets" | sort -u)" > $outFile
|
||||
exit #kopa
|
||||
|
||||
### Ajout des membres sans transaction au fichier tampon ###
|
||||
loopMembers() {
|
||||
iter=0
|
||||
local iter=0
|
||||
for i in ${MEMBERS[*]}; do
|
||||
|
||||
progress=$(echo "scale=0; $iter*100/$nbrMembers/1" | bc)
|
||||
local progress=$(echo "scale=0; $iter*100/$nbrMembers/1" | bc)
|
||||
if [[ $progress =~ ^(0|10|20|30|40|50|60|70|80|90|99)$ ]]; then
|
||||
[[ $progress == 99 ]] && progress=100
|
||||
if [[ $isWeb != "web" ]]; then
|
||||
clear
|
||||
echo "Heure de début: $startTime"
|
||||
echo
|
||||
echo "Scan en cours: 100% - $bloc/$lastBloc"
|
||||
echo "Scan en cours: 100% - $lastBloc/$lastBloc"
|
||||
echo "Ajouts des comptes membres ... $progress%"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -z $(grep "$i" $outFile) ]]; then
|
||||
echo -e "$i" >> $outFile
|
||||
if [[ -z $(echo "$wallets" | grep "$i") ]]; then
|
||||
wallets+=$'\n'"$i"
|
||||
fi
|
||||
|
||||
((iter++))
|
||||
|
|
@ -94,7 +104,7 @@ done
|
|||
loopMembers
|
||||
|
||||
### Calcul du nombre de wallets ###
|
||||
nbrTotalWallets=$(cat $outFile | wc -l)
|
||||
nbrTotalWallets=$(echo "$wallets" | wc -l)
|
||||
nbrSimpleWallets=$(echo "$nbrTotalWallets-$nbrMembers" | bc)
|
||||
pourcentMbrs=$(echo "scale=1; $nbrMembers*100/$nbrTotalWallets/1" | bc)
|
||||
pourcentWallets=$(echo "scale=1; $nbrSimpleWallets*100/$nbrTotalWallets/1" | bc)
|
||||
|
|
@ -108,9 +118,9 @@ web() {
|
|||
[ ! -d $WEBPATH/js ] && cp -r $SCRIPTPATH/tpl/js $WEBPATH/
|
||||
cp $SCRIPTPATH/tpl/index.html $indexhtml
|
||||
|
||||
datePrevious=$(date +'%y-%m-%d' -d "$day -1 day")
|
||||
local datePrevious=$(date +'%y-%m-%d' -d "$day -1 day")
|
||||
[[ -z $(ls -l $WEBPATH/history/ | grep $datePrevious) && -z $(grep '"display:none;" class="previous"' $indexhtml) ]] && sed -i "s/class=\"previous\"/style=\"display:none;\" class=\"previous\"/g" $indexhtml
|
||||
dateNext=$(date +'%y-%m-%d' -d "$day +1 day")
|
||||
local dateNext=$(date +'%y-%m-%d' -d "$day +1 day")
|
||||
[[ -z $(ls -l $WEBPATH/history/ | grep $dateNext) && -z $(grep '"display:none;" class="next"' $indexhtml) ]] && sed -i "s/class=\"next\"/style=\"display:none;\" class=\"next\"/g" $indexhtml
|
||||
|
||||
sed -i "s/_nbrTotalWallets/$nbrTotalWallets/g" $indexhtml
|
||||
|
|
@ -120,21 +130,21 @@ web() {
|
|||
sed -i "s/_pourcentWallets/$pourcentWallets/g" $indexhtml
|
||||
# sed -i "s/_node/$DUNITER/g" $indexhtml
|
||||
sed -i "s/_heure/$startTime/g" $indexhtml
|
||||
sed -i "s/_day/$dayP/g" $indexhtml
|
||||
sed -i "s/_day/$dayP/g" $indexhtml
|
||||
sed -i "s/_txInSimple/$txInSimple/g" $indexhtml
|
||||
sed -i "s/_txOutSimple/$txOutSimple/g" $indexhtml
|
||||
sed -i "s/_soldeSimple/$soldeSimple/g" $indexhtml
|
||||
sed -i "s/_txInMembers/$txInMembers/g" $indexhtml
|
||||
sed -i "s/_txOutMembers/$txOutMembers/g" $indexhtml
|
||||
sed -i "s/_soldeMembers/$soldeMembers/g" $indexhtml
|
||||
sed -i "s/_txInMembers/$txInMembers/g" $indexhtml
|
||||
sed -i "s/_txOutMembers/$txOutMembers/g" $indexhtml
|
||||
sed -i "s/_soldeMembers/$soldeMembers/g" $indexhtml
|
||||
sed -i "s/_pourcentSimpleWallet/$pourcentSimpleWallet/g" $indexhtml
|
||||
sed -i "s/_nonConsumedUDT/$nonConsumedUDT/g" $indexhtml
|
||||
sed -i "s/_monetaryMass/$monetaryMass/g" $indexhtml
|
||||
sed -i "s/_monetaryMass/$monetaryMass/g" $indexhtml
|
||||
sed -i "s/_sleepyG1/$sleepyG1/g" $indexhtml
|
||||
[[ -z $(grep '"display:none;" class="previous"' $indexhtml) ]] && sed -i "s/_datePrevious/$datePrevious/g" $indexhtml && setPrevious="Oui"
|
||||
[[ -z $(grep '"display:none;" class="next"' $indexhtml) ]] && sed -i "s/_dateNext/$dateNext/g" $indexhtml && setNext="Oui"
|
||||
[[ -z $(grep '"display:none;" class="previous"' $indexhtml) ]] && sed -i "s/_datePrevious/$datePrevious/g" $indexhtml && setPrevious="Oui"
|
||||
[[ -z $(grep '"display:none;" class="next"' $indexhtml) ]] && sed -i "s/_dateNext/$dateNext/g" $indexhtml && setNext="Oui"
|
||||
|
||||
cat "$outFile" | grep . > $WEBPATH/wallets-g1.txt
|
||||
echo "$wallets" | grep . > $WEBPATH/wallets-g1.txt
|
||||
echo -e "${MEMBERS[@]}" | sed 's/ /\n/g' > $WEBPATH/wallets-g1-membres.txt
|
||||
echo -e "$simpleWallets" > $WEBPATH/wallets-g1-simple.txt
|
||||
|
||||
|
|
@ -164,7 +174,7 @@ echo "Extraction wallets membres / Simples portefeuille"
|
|||
echo -e "\n ---\n"
|
||||
|
||||
### Isolation des simples portefeuilles ###
|
||||
simpleWallets=$(cat $outFile)
|
||||
simpleWallets="$wallets"
|
||||
echo "Isolation des simples portefeuilles..."
|
||||
for i in ${MEMBERS[@]}; do
|
||||
simpleWallets=$(echo "$simpleWallets" | grep -v "$i")
|
||||
|
|
@ -172,36 +182,36 @@ done
|
|||
|
||||
### Boucle d'obtention des soldes ###
|
||||
getSolde(){
|
||||
solde=0
|
||||
txInT=0
|
||||
txOutT=0
|
||||
nonConsumedUDT=0
|
||||
nonConsumedUD=0
|
||||
for i in $pubkeys; do
|
||||
until txInL=$(curl -s "$ESNODE/g1/movement/_search?filter_path=hits.hits._source&size=10000&q=recipient:$i&pretty"); do
|
||||
echo "Erreur: $i"
|
||||
sleep 2
|
||||
solde=0
|
||||
txInT=0
|
||||
txOutT=0
|
||||
nonConsumedUDT=0
|
||||
nonConsumedUD=0
|
||||
for i in $pubkeys; do
|
||||
until txInL=$(curl -s "$ESNODE/g1/movement/_search?filter_path=hits.hits._source&size=10000&q=recipient:$i&pretty"); do
|
||||
echo "Erreur: $i"
|
||||
sleep 1
|
||||
done
|
||||
until txOutL=$(curl -s "$ESNODE/g1/movement/_search?filter_path=hits.hits._source&size=10000&q=issuer:$i&pretty"); do
|
||||
echo "Erreur: $i"
|
||||
sleep 1
|
||||
done
|
||||
|
||||
if [[ $1 == "mbr" ]]; then
|
||||
nonConsumedUD=$(curl -s ${DUNITER}/ud/history/$i | jq '.history.history[].amount' | awk '{s+=$1} END {print s}') || nonConsumedUD=0
|
||||
[[ -z $nonConsumedUD ]] && nonConsumedUD=0
|
||||
nonConsumedUDT=$(echo -e "scale=2; ($nonConsumedUD/100)+$nonConsumedUDT" | bc)
|
||||
fi
|
||||
|
||||
[[ $txInL != "{ }" ]] && txIn=$(echo "$txInL" | jq '.hits.hits[]._source.amount' | awk '{s+=$1} END {print s}') || txIn=0
|
||||
[[ $txOutL != "{ }" ]] && txOut=$(echo "$txOutL" | jq '.hits.hits[]._source.amount' | awk '{s+=$1} END {print s}') || txOut=0
|
||||
|
||||
solde=$(echo -e "scale=2; (($txIn-$txOut+$nonConsumedUD)/100)+$solde" | bc)
|
||||
|
||||
txInT=$(echo -e "scale=2; (($txIn+$nonConsumedUD)/100)+$txInT" | bc)
|
||||
txOutT=$(echo -e "scale=2; ($txOut/100)+$txOutT" | bc)
|
||||
|
||||
done
|
||||
until txOutL=$(curl -s "$ESNODE/g1/movement/_search?filter_path=hits.hits._source&size=10000&q=issuer:$i&pretty"); do
|
||||
echo "Erreur: $i"
|
||||
sleep 2
|
||||
done
|
||||
|
||||
if [[ $1 == "mbr" ]]; then
|
||||
nonConsumedUD=$(curl -s ${DUNITER}/ud/history/$i | jq '.history.history[].amount' | awk '{s+=$1} END {print s}') || nonConsumedUD=0
|
||||
[[ -z $nonConsumedUD ]] && nonConsumedUD=0
|
||||
nonConsumedUDT=$(echo -e "scale=2; ($nonConsumedUD/100)+$nonConsumedUDT" | bc)
|
||||
fi
|
||||
|
||||
[[ $txInL != "{ }" ]] && txIn=$(echo "$txInL" | jq '.hits.hits[]._source.amount' | awk '{s+=$1} END {print s}') || txIn=0
|
||||
[[ $txOutL != "{ }" ]] && txOut=$(echo "$txOutL" | jq '.hits.hits[]._source.amount' | awk '{s+=$1} END {print s}') || txOut=0
|
||||
|
||||
solde=$(echo -e "scale=2; (($txIn-$txOut+$nonConsumedUD)/100)+$solde" | bc)
|
||||
|
||||
txInT=$(echo -e "scale=2; (($txIn+$nonConsumedUD)/100)+$txInT" | bc)
|
||||
txOutT=$(echo -e "scale=2; ($txOut/100)+$txOutT" | bc)
|
||||
|
||||
done
|
||||
}
|
||||
|
||||
echo "Récupération du solde des simples wallets..."
|
||||
|
|
@ -249,6 +259,5 @@ echo -e "$sleepyG1% des Ḡ1 n'ont jamais été utilisés."
|
|||
[[ $isWeb == "web" ]] && web
|
||||
|
||||
### Fin de programme ###
|
||||
rm $outFile
|
||||
day=$(date +'%d-%m-%y')
|
||||
echo "$day - Heure de fin: $(date +'%H:%M')"
|
||||
|
|
|
|||
Loading…
Reference in New Issue