diff --git a/debug.log b/debug.log new file mode 100644 index 0000000..35d8078 --- /dev/null +++ b/debug.log @@ -0,0 +1,480 @@ +i: 0 +iter: 0 +Bloc: 52 +--- +i: 1 +iter: 1 +Bloc: 60 +--- +i: 2 +iter: 2 +Bloc: 62 +--- +i: 3 +iter: 3 +Bloc: 63 +--- +i: 4 +iter: 4 +Bloc: 64 +--- +i: 5 +iter: 5 +Bloc: 71 +--- +i: 6 +iter: 6 +Bloc: 82 +--- +i: 7 +iter: 7 +Bloc: 87 +--- +i: 8 +iter: 8 +Bloc: 98 +--- +i: 9 +iter: 9 +Bloc: 100 +--- +i: 10 +iter: 10 +Bloc: 107 +--- +i: 11 +iter: 11 +Bloc: 108 +--- +i: 12 +iter: 12 +Bloc: 110 +--- +i: 13 +iter: 13 +Bloc: 111 +--- +i: 14 +iter: 14 +Bloc: 112 +--- +i: 15 +iter: 15 +Bloc: 114 +--- +i: 16 +iter: 16 +Bloc: 115 +--- +i: 17 +iter: 17 +Bloc: 116 +--- +i: 18 +iter: 18 +Bloc: 117 +--- +i: 19 +iter: 19 +Bloc: 118 +--- +i: 20 +iter: 20 +Bloc: 119 +--- +i: 21 +iter: 21 +Bloc: 120 +--- +i: 22 +iter: 22 +Bloc: 121 +--- +i: 23 +iter: 23 +Bloc: 122 +--- +i: 24 +iter: 24 +Bloc: 123 +--- +i: 25 +iter: 25 +Bloc: 124 +--- +i: 26 +iter: 26 +Bloc: 126 +--- +i: 27 +iter: 27 +Bloc: 128 +--- +i: 28 +iter: 28 +Bloc: 131 +--- +i: 29 +iter: 29 +Bloc: 135 +--- +i: 30 +iter: 30 +Bloc: 143 +--- +i: 31 +iter: 31 +Bloc: 150 +--- +i: 32 +iter: 32 +Bloc: 151 +--- +i: 33 +iter: 33 +Bloc: 152 +--- +i: 34 +iter: 34 +Bloc: 153 +--- +i: 35 +iter: 35 +Bloc: 155 +--- +i: 36 +iter: 36 +Bloc: 237 +--- +i: 37 +iter: 37 +Bloc: 238 +--- +i: 38 +iter: 38 +Bloc: 240 +--- +i: 39 +iter: 39 +Bloc: 242 +--- +i: 40 +iter: 40 +Bloc: 243 +--- +i: 41 +iter: 41 +Bloc: 244 +--- +i: 42 +iter: 42 +Bloc: 245 +--- +i: 43 +iter: 43 +Bloc: 247 +--- +i: 44 +iter: 44 +Bloc: 250 +--- +i: 45 +iter: 45 +Bloc: 257 +--- +i: 46 +iter: 46 +Bloc: 260 +--- +i: 47 +iter: 47 +Bloc: 263 +--- +i: 48 +iter: 48 +Bloc: 265 +--- +i: 49 +iter: 49 +Bloc: 267 +--- +i: 50 +iter: 50 +Bloc: 272 +--- +i: 51 +iter: 51 +Bloc: 282 +--- +i: 52 +iter: 52 +Bloc: 291 +--- +i: 53 +iter: 53 +Bloc: 292 +--- +i: 54 +iter: 54 +Bloc: 294 +--- +i: 55 +iter: 55 +Bloc: 297 +--- +i: 56 +iter: 56 +Bloc: 304 +--- +i: 57 +iter: 57 +Bloc: 318 +--- +i: 58 +iter: 58 +Bloc: 323 +--- +i: 59 +iter: 59 +Bloc: 330 +--- +i: 60 +iter: 60 +Bloc: 332 +--- +i: 61 +iter: 61 +Bloc: 333 +--- +i: 62 +iter: 62 +Bloc: 334 +--- +i: 63 +iter: 63 +Bloc: 336 +--- +i: 64 +iter: 64 +Bloc: 347 +--- +i: 65 +iter: 65 +Bloc: 353 +--- +i: 66 +iter: 66 +Bloc: 361 +--- +i: 67 +iter: 67 +Bloc: 363 +--- +i: 68 +iter: 68 +Bloc: 365 +--- +i: 69 +iter: 69 +Bloc: 366 +--- +i: 70 +iter: 70 +Bloc: 367 +--- +i: 71 +iter: 71 +Bloc: 370 +--- +i: 72 +iter: 72 +Bloc: 372 +--- +i: 73 +iter: 73 +Bloc: 375 +--- +i: 74 +iter: 74 +Bloc: 381 +--- +i: 75 +iter: 75 +Bloc: 385 +--- +i: 76 +iter: 76 +Bloc: 387 +--- +i: 77 +iter: 77 +Bloc: 389 +--- +i: 78 +iter: 78 +Bloc: 395 +--- +i: 79 +iter: 79 +Bloc: 399 +--- +i: 80 +iter: 80 +Bloc: 401 +--- +i: 81 +iter: 81 +Bloc: 403 +--- +i: 82 +iter: 82 +Bloc: 408 +--- +i: 83 +iter: 83 +Bloc: 428 +--- +i: 84 +iter: 84 +Bloc: 443 +--- +i: 85 +iter: 85 +Bloc: 446 +--- +i: 86 +iter: 86 +Bloc: 489 +--- +i: 87 +iter: 87 +Bloc: 504 +--- +i: 88 +iter: 88 +Bloc: 537 +--- +i: 89 +iter: 89 +Bloc: 538 +--- +i: 90 +iter: 90 +Bloc: 541 +--- +i: 91 +iter: 91 +Bloc: 558 +--- +i: 92 +iter: 92 +Bloc: 559 +--- +i: 93 +iter: 93 +Bloc: 562 +--- +i: 94 +iter: 94 +Bloc: 567 +--- +i: 95 +iter: 95 +Bloc: 568 +--- +i: 96 +iter: 96 +Bloc: 572 +--- +i: 97 +iter: 97 +Bloc: 575 +--- +i: 98 +iter: 98 +Bloc: 577 +--- +i: 99 +iter: 99 +Bloc: 584 +--- +i: 100 +iter: 100 +Bloc: 585 +--- +i: 101 +iter: 101 +Bloc: 586 +--- +i: 102 +iter: 102 +Bloc: 588 +--- +i: 103 +iter: 103 +Bloc: 593 +--- +i: 104 +iter: 104 +Bloc: 594 +--- +i: 105 +iter: 105 +Bloc: 598 +--- +i: 106 +iter: 106 +Bloc: 602 +--- +i: 107 +iter: 107 +Bloc: 606 +--- +i: 108 +iter: 108 +Bloc: 612 +--- +i: 109 +iter: 109 +Bloc: 615 +--- +i: 110 +iter: 110 +Bloc: 617 +--- +i: 111 +iter: 111 +Bloc: 624 +--- +i: 112 +iter: 112 +Bloc: 626 +--- +i: 113 +iter: 113 +Bloc: 627 +--- +i: 114 +iter: 114 +Bloc: 629 +--- +i: 115 +iter: 115 +Bloc: 631 +--- +i: 116 +iter: 116 +Bloc: 648 +--- +i: 117 +iter: 117 +Bloc: 656 +--- +i: 118 +iter: 118 +Bloc: 669 +--- +i: 119 +iter: 119 +Bloc: 670 +--- diff --git a/g1-stats.sh b/g1-stats.sh index ed32415..c8bed5a 100755 --- a/g1-stats.sh +++ b/g1-stats.sh @@ -20,8 +20,8 @@ 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=$(cat $SCRIPTPATH/db/txblocs) -#TXBLOCKS=$(curl -s ${DUNITER}/blockchain/with/tx | jq '.result.blocks[]') +#TXBLOCKS=$(cat $SCRIPTPATH/db/txblocs) +TXBLOCKS=$(curl -s ${DUNITER}/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 -r '.results[].pubkey') @@ -51,19 +51,21 @@ loopWalletUp() { echo "[" > $SCRIPTPATH/db/recus.json fi - for i in ${TXBLOCKS[*]:$startIter}; do - [[ -z $i ]] && break + rm -f debug.log #kopa + for i in ${!TXBLOCKS[*]}; do + [[ -z ${TXBLOCKS[$i]} ]] && break + [[ $i != 0 && $i -le $startIter ]] && continue sleep 0.05 # Récupère la date et l'objet transaction du bloc courant - WALLETS0=$(curl -s ${DUNITER}/blockchain/block/$i) + WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]}) until WALLETS=$(echo $WALLETS0 | jq -r '.medianTime, .transactions[]' 2>/dev/null); do - [[ $isWeb != "web" ]] && echo -e "iter $iter \n$WALLETS0" + [[ $isWeb != "web" ]] && echo -e "iter $iter \n$WALLETS0" | tee -a debug.log sleep 2 - WALLETS0=$(curl -s ${DUNITER}/blockchain/block/$i) + WALLETS0=$(curl -s ${DUNITER}/blockchain/block/${TXBLOCKS[$i]}) done [[ -z "$WALLETS" ]] && continue - bloc=$i + bloc=${TXBLOCKS[$i]} # Récupération de la date du block blockDate=$(echo "$WALLETS" | head -n1) @@ -86,7 +88,6 @@ loopWalletUp() { unset recusJson startBloc=0 fi - # Sélectionne les ligne SIG en retirant les issuers OIFS="$IFS" IFS='{' @@ -146,9 +147,11 @@ loopWalletUp() { echo "Date: $blockDate" fi + # Debug # + echo -e "i: $i\niter: $iter\nBloc: $bloc\n---" >> debug.log ((iter++)) +# [[ $i -ge 10 ]] && break #kopaa -# [[ $iter -ge 10 ]] && break #kopa done jsonify @@ -162,12 +165,15 @@ loopWalletUp() { # On écrit les pubkeys avec transaction dans un fichier de cache pour la prochaine itération # ((iter--)) [[ ! -d $SCRIPTPATH/cache ]] && mkdir $SCRIPTPATH/cache - echo -e "$lastBloc\n$wallets" > $SCRIPTPATH/cache/walletsUp-$iter + echo -e "$lastBloc\n$wallets" > $SCRIPTPATH/cache/walletsUp-$i } loopWalletUp $SCRIPTPATH/sum.sh +endDate=$(date +'%H:%M') +echo "Heure de fin: $endDate" + exit diff --git a/test.sh b/test.sh new file mode 100755 index 0000000..53b7528 --- /dev/null +++ b/test.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +tab="a +b +c +d +e" +#tab=($tab) +tab=($(cat db/recus.json)) + +start=10300 + +for i in "${!tab[@]}"; do + [[ $i -le $start ]] && continue + + echo "tab opt: ${tab[$i]}" + echo "i: $i" + +done