diff --git a/g1-stats.sh b/g1-stats.sh index 571b822..9ea1804 100755 --- a/g1-stats.sh +++ b/g1-stats.sh @@ -22,11 +22,11 @@ echo -e "\n############# $day à $startTime #############\n" [[ -z $(which jq) || -z $(which bc) ]] && apt update && apt install jq bc echo "Initialisation ..." TXBLOCKS=$(cat $SCRIPTPATH/db/txblocs) #kopa -#TXBLOCKS=$(curl -s ${DUNITER}/blockchain/with/tx | jq '.result.blocks[]') -TXBLOCKS=($(echo "$TXBLOCKS" | sort -hu | awk '{printf $1" "}')) +TXBLOCKS=$(curl -s ${DUNITER}/blockchain/with/tx | jq '.result.blocks[]') +#TXBLOCKS=($(echo "$TXBLOCKS" | sort -hu | awk '{printf $1" "}')) unset 'TXBLOCKS[${#TXBLOCKS[@]}-1]' -#membresPubkeys=$(curl -s ${DUNITER}/wot/members | jq -r '.results[].pubkey') -membresPubkeys=$(cat db/membresPubkeys) #kopa +membresPubkeys=$(curl -s ${DUNITER}/wot/members | jq -r '.results[].pubkey') +#membresPubkeys=$(cat db/membresPubkeys) #kopa nbrMembers=$(echo "$membresPubkeys" | wc -l) lastBloc=${TXBLOCKS[-1]} udBlocs=$(curl -s ${DUNITER}/blockchain/with/ud | jq '.result.blocks[]') diff --git a/lib/scanTxWallets.sh b/lib/scanTxWallets.sh index 6de0c91..aeb0cd2 100755 --- a/lib/scanTxWallets.sh +++ b/lib/scanTxWallets.sh @@ -113,7 +113,7 @@ scanTxWallets() { nbrMembersTotalToday=$(jq '.membersCount' <<<"$blocBrut") [[ -z $nbrMembersYesterday ]] && nbrMembersYesterday=0 nbrMembersToday=$(($nbrMembersTotalToday-$nbrMembersYesterday)) - + # Obtention du dividende à ce block udBlock=$(for i in $udBlocs; do [[ $i -ge $bloc ]] && echo $lastBloc && break; lastBloc=$i; done) UDToday=$(curl -s ${DUNITER}/blockchain/block/$udBlock | jq '.dividend') @@ -191,7 +191,7 @@ scanTxWallets() { echo "Scan des blocs avec transactions en cours ..." fi - [[ $i -ge $1 ]] && break #kopa +# [[ $i -ge $1 ]] && break #kopa done [[ $blockDateLast == $blockDate ]] && applyToday