From 6e8ac5db72b3d350383c31a605296159b92c7e0b Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Tue, 22 Sep 2020 05:09:08 +0200
Subject: [PATCH] Take nbrMembers of UDBloc instead of last bloc of the day

---
 lib/scanTxWallets.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/scanTxWallets.sh b/lib/scanTxWallets.sh
index 6190f52..78ef24e 100755
--- a/lib/scanTxWallets.sh
+++ b/lib/scanTxWallets.sh
@@ -126,11 +126,6 @@ scanTxWallets() {
 			nbrWallets=$(echo "$walletsAujTmp" | wc -l)
 			unset walletsAujTmp
 
-			# Calcul du nombre de nouveaux membres à ce block
-			nbrMembersTotalToday=$(jq '.membersCount' <<<"$blocBrut")
-			[[ -z $nbrMembersYesterday ]] && nbrMembersYesterday=0
-			nbrMembersToday=$(($nbrMembersTotalToday-$nbrMembersYesterday))
-
 			# Obtention du dividende à ce block
 			local j
 			for j in $udBlocs; do
@@ -138,7 +133,13 @@ scanTxWallets() {
 				lastUdBloc=$j
 			done
 			[[ -z $lastUdBloc ]] && lastUdBloc=$(echo "$udBlocs" | tail -n1)
-			UDToday=$(curl -s ${DUNITER}/blockchain/block/$lastUdBloc | jq '.dividend' | xargs -i echo "scale=2; {}/100" | bc)
+			blocUD=$(curl -s ${DUNITER}/blockchain/block/$lastUdBloc | jq '.membersCount,.dividend')
+			UDToday=$(echo "$blocUD" | tail -n1 | xargs -i echo "scale=2; {}/100" | bc)
+
+			# Calcul du nombre de nouveaux membres à ce block
+			nbrMembersTotalToday=$(echo "$blocUD" | head -n1)
+			[[ -z $nbrMembersYesterday ]] && nbrMembersYesterday=0
+			nbrMembersToday=$(($nbrMembersTotalToday-$nbrMembersYesterday))
 
 			jsonify
 		}