forked from axiom-team/g1-stats
Use explorer instead custom function in sumSoldes()
This commit is contained in:
parent
e7adaa1990
commit
856b136539
10
explorer.sh
10
explorer.sh
|
@ -19,13 +19,17 @@ cumulate() {
|
||||||
|
|
||||||
sumRWBrut=$(jq -r '.[].rWallets' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
sumRWBrut=$(jq -r '.[].rWallets' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
||||||
sumRMBrut=$(jq -r '.[].rMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
sumRMBrut=$(jq -r '.[].rMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
||||||
#sumRTBrut=$(jq -r '.[] | .rWallets, .rMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
sumRTBrut=$(jq -r '.[] | .rWallets, .rMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
||||||
sumSWBrut=$(jq -r '.[].sWallets' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
sumSWBrut=$(jq -r '.[].sWallets' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
||||||
sumSMBrut=$(jq -r '.[].sMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
sumSMBrut=$(jq -r '.[].sMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
||||||
#sumSTBrut=$(jq -r '.[] | .sWallets, .sMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
sumSTBrut=$(jq -r '.[] | .sWallets, .sMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
||||||
|
|
||||||
nbrMembers=$(jq -r '.[].nbrMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
nbrMembers=$(jq -r '.[].nbrMembers' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
||||||
nbrWallets=$(jq -r '.[].nbrWallets' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
nbrWallets=$(jq -r '.[].nbrWallets' <<<$jsonDated | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
||||||
|
|
||||||
|
soldeWBrut=$(echo "$sumRWBrut-$sumSWBrut" | bc)
|
||||||
|
soldeMBrut=$(echo "$sumRMBrut-$sumSMBrut" | bc)
|
||||||
|
|
||||||
UD=$(jq -r '.[].UD' <<<$jsonDated | tail -n1)
|
UD=$(jq -r '.[].UD' <<<$jsonDated | tail -n1)
|
||||||
|
|
||||||
echo "{
|
echo "{
|
||||||
|
@ -33,8 +37,10 @@ cumulate() {
|
||||||
\"UD\": $UD,
|
\"UD\": $UD,
|
||||||
\"rWallets\": $sumRWBrut,
|
\"rWallets\": $sumRWBrut,
|
||||||
\"sWallets\": $sumSWBrut,
|
\"sWallets\": $sumSWBrut,
|
||||||
|
\"soldeWallets\": $soldeWBrut,
|
||||||
\"rMembers\": $sumRMBrut,
|
\"rMembers\": $sumRMBrut,
|
||||||
\"sMembers\": $sumSMBrut,
|
\"sMembers\": $sumSMBrut,
|
||||||
|
\"soldeMembers\": $soldeMBrut,
|
||||||
\"nbrMembers\": $nbrMembers,
|
\"nbrMembers\": $nbrMembers,
|
||||||
\"nbrWallets\": $nbrWallets
|
\"nbrWallets\": $nbrWallets
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Author: Poka (poka@p2p.legal)
|
# Author: Poka (poka@p2p.legal)
|
||||||
# Version: 0.2.0
|
# Version: 0.3.0
|
||||||
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
|
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
|
||||||
# Git: https://git.p2p.legal/axiom-team/g1-stats
|
# Git: https://git.p2p.legal/axiom-team/g1-stats
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
|
@ -77,16 +77,7 @@ web() {
|
||||||
}
|
}
|
||||||
|
|
||||||
sumSoldes() {
|
sumSoldes() {
|
||||||
sumRWBrut=$(jq -r '.[].rWallets' $jsonFile | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
source $GPATH/explorer.sh > /dev/null
|
||||||
sumRMBrut=$(jq -r '.[].rMembers' $jsonFile | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
|
||||||
sumRTBrut=$(jq -r '.[] | .rWallets, .rMembers' $jsonFile | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
|
||||||
sumSWBrut=$(jq -r '.[].sWallets' $jsonFile | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
|
||||||
#sumSWBrut=$(jq -n '[inputs | .[].sWallets] | reduce .[] as $num (0; .+$num)' $jsonFile | xargs printf %.2f | tr ',' '.')
|
|
||||||
sumSMBrut=$(jq -r '.[].sMembers' $jsonFile | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
|
||||||
sumSTBrut=$(jq -r '.[] | .sWallets, .sMembers' $jsonFile | awk '{ SUM += $1} END { printf "%.2f", SUM }')
|
|
||||||
|
|
||||||
soldeWBrut=$(echo "$sumRWBrut-$sumSWBrut" | bc)
|
|
||||||
soldeMBrut=$(echo "$sumRMBrut-$sumSMBrut" | bc)
|
|
||||||
|
|
||||||
sumRW=$(echo $sumRWBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
sumRW=$(echo $sumRWBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
||||||
sumRM=$(echo $sumRMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
sumRM=$(echo $sumRMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
||||||
|
@ -94,17 +85,15 @@ sumSoldes() {
|
||||||
sumSW=$(echo $sumSWBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
sumSW=$(echo $sumSWBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
||||||
sumSM=$(echo $sumSMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
sumSM=$(echo $sumSMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
||||||
sumST=$(echo $sumSTBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
sumST=$(echo $sumSTBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
||||||
|
|
||||||
soldeW=$(echo $soldeWBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
soldeW=$(echo $soldeWBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
||||||
soldeM=$(echo $soldeMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
soldeM=$(echo $soldeMBrut | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
||||||
|
|
||||||
### Calcul de la masse monétaire et du pourcentage de Ḡ1 sur les simples portefeuilles ###
|
### Calcul de la masse monétaire et du pourcentage de Ḡ1 sur les simples portefeuilles
|
||||||
monetaryMassBrut=$(curl -s ${DUNITER}/blockchain/current | jq .monetaryMass | xargs -i echo "scale=2; ({}/100)/1" | bc)
|
monetaryMassBrut=$($GPATH/explorer.sh mass)
|
||||||
monetaryMass=$(echo "$monetaryMassBrut" | tr . , | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
monetaryMass=$(echo "$monetaryMassBrut" | sed ':a;s/\B[0-9]\{3\}\>/ &/;ta')
|
||||||
|
|
||||||
pourcentSimpleWallet=$(echo "$soldeWBrut*100/$monetaryMassBrut/1" | bc -l | xargs printf %.1f)
|
pourcentSimpleWallet=$(echo "$soldeWBrut*100/$monetaryMassBrut/1" | bc -l | xargs printf %.1f)
|
||||||
|
sleepyG1=$(echo "100-$sumSTBrut*100/$monetaryMassBrut" | bc -l | xargs printf %.1f)
|
||||||
sleepyG1=$(echo "100-$sumSTBrut*100/$monetaryMassBrut" | bc -l | xargs printf %.1f | tr . ,)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
nbrWallets() {
|
nbrWallets() {
|
||||||
|
|
|
@ -13,7 +13,8 @@ scanTxWallets() {
|
||||||
local nbrMembersYesterday=$(cat "$startFile" | sed -e '1,/---/d' | sed -e '1,/---/d' | sed '/---/Q' | grep . | cut -d '|' -f 1)
|
local nbrMembersYesterday=$(cat "$startFile" | sed -e '1,/---/d' | sed -e '1,/---/d' | sed '/---/Q' | grep . | cut -d '|' -f 1)
|
||||||
local blockDateLast=$(cat "$startFile" | sed -e '1,/---/d' | sed -e '1,/---/d' | sed '/---/Q' | grep . | cut -d '|' -f 2)
|
local blockDateLast=$(cat "$startFile" | sed -e '1,/---/d' | sed -e '1,/---/d' | sed '/---/Q' | grep . | cut -d '|' -f 2)
|
||||||
local nbrDays=$(cat "$startFile" | sed -e '1,/---/d' | sed -e '1,/---/d' | sed '/---/Q' | grep . | cut -d '|' -f 3)
|
local nbrDays=$(cat "$startFile" | sed -e '1,/---/d' | sed -e '1,/---/d' | sed '/---/Q' | grep . | cut -d '|' -f 3)
|
||||||
! ($debug) && [[ $lastBloc -le $startBloc || $startIter -ge ${#TXBLOCKS[@]} ]] && return
|
#! ($debug) &&
|
||||||
|
[[ $lastBloc -le $startBloc || $startIter -ge ${#TXBLOCKS[@]} ]] && return
|
||||||
rm $startFile
|
rm $startFile
|
||||||
else
|
else
|
||||||
local startIter=0
|
local startIter=0
|
||||||
|
@ -105,7 +106,7 @@ scanTxWallets() {
|
||||||
[[ -z $wallets ]] && wallets="#"
|
[[ -z $wallets ]] && wallets="#"
|
||||||
local WALLETS=$(echo -e "$wallets" | grep .)
|
local WALLETS=$(echo -e "$wallets" | grep .)
|
||||||
|
|
||||||
# On split la listes des wallets pour ne pas saturer grep
|
# On split la liste des wallets pour ne pas saturer grep
|
||||||
local id=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
|
local id=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
|
||||||
local tmpSplit="/tmp/g1stats-splits-$id"
|
local tmpSplit="/tmp/g1stats-splits-$id"
|
||||||
mkdir -p $tmpSplit
|
mkdir -p $tmpSplit
|
||||||
|
|
Loading…
Reference in New Issue