Skip to content

Commit ba0c23d

Browse files
authored
Merge pull request #4189 from ProvableHQ/mainnet-release-v460
[Release] Mainnet v4.6.0
2 parents 3ec1b51 + 0b9c316 commit ba0c23d

File tree

236 files changed

+3091
-2197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+3091
-2197
lines changed

.cargo/release-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v4.6.0

.ci/bench_bft_sync.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ done
9191
# Block until nodes are running and connected to each other.
9292
wait_for_nodes $((num_nodes+1)) 0 "$network_name"
9393

94-
SECONDS=0
94+
start=$(now)
9595

9696
# Wait for all validators to be connected to each other via the gateway.
9797
for ((node_index = 0; node_index < num_nodes+1; node_index++)); do
@@ -100,18 +100,18 @@ for ((node_index = 0; node_index < num_nodes+1; node_index++)); do
100100
fi
101101
done
102102

103-
connect_time=$SECONDS
103+
connect_time=$(elapsed_since "$start")
104104
log "ℹ️ Nodes are fully connected (took $connect_time secs). Starting block sync measurement."
105105

106106
# Check heights periodically with a timeout
107-
SECONDS=0
108-
while (( SECONDS < max_wait )); do
107+
start=$(now)
108+
while (( $(elapsed_since "$start") < max_wait )); do
109109
# The last block cannot be fully applied to the ledger yet as there is no next block to confirm it.
110110
# However, we know that the sync height of a node is always at least one more than the ledger height.
111111
expected_height=$((min_height-1))
112+
total_wait=$(elapsed_since "$start")
112113

113-
if check_heights 1 $((num_nodes+1)) $expected_height "$network_name" "$SECONDS"; then
114-
total_wait=$SECONDS
114+
if check_heights 1 $((num_nodes+1)) $expected_height "$network_name" "$total_wait"; then
115115
throughput=$(compute_throughput "$min_height" "$total_wait")
116116

117117
log "🎉 BFT sync benchmark done! Waited $total_wait seconds for $min_height blocks. Throughput was $throughput blocks/s."
@@ -123,7 +123,7 @@ while (( SECONDS < max_wait )); do
123123
fi
124124

125125
# Continue waiting
126-
sleep $poll_interval
126+
sleep "$poll_interval"
127127
done
128128

129129
log "❌ Benchmark failed! Validators did not sync within 30 minutes."

.ci/bench_cdn_sync.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ PIDS[0]=$!
5454
wait_for_nodes 0 1 "$network_name"
5555

5656
# Check heights periodically with a timeout
57-
SECONDS=0
58-
while (( SECONDS < max_wait )); do
59-
if check_heights 0 1 $min_height "$network_name" "$SECONDS"; then
60-
total_wait=$SECONDS
57+
start=$(now)
58+
while (( $(elapsed_since "$start") < max_wait )); do
59+
total_wait=$(elapsed_since "$start")
60+
if check_heights 0 1 $min_height "$network_name" "$total_wait"; then
6161
throughput=$(compute_throughput "$min_height" "$total_wait")
6262

6363
log "🎉 Benchmark done! Waited ${total_wait}s for $min_height blocks. Throughput was $throughput blocks/s."
@@ -69,7 +69,7 @@ while (( SECONDS < max_wait )); do
6969
fi
7070

7171
# Continue waiting
72-
sleep $poll_interval
72+
sleep "$poll_interval"
7373
done
7474

7575
log "❌ Benchmark failed! Client did not sync within 30 minutes."

.ci/bench_p2p_sync.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ while (( SECONDS < 30 )); do
157157
break
158158
fi
159159

160-
sleep $poll_interval
160+
sleep "$poll_interval"
161161
done
162162

163163
if ! $has_blocks; then
@@ -199,7 +199,7 @@ while (( SECONDS < max_wait )); do
199199
fi
200200

201201
# Continue waiting
202-
sleep $poll_interval
202+
sleep "$poll_interval"
203203
done
204204

205205
log "❌ Benchmark failed! Clients did not sync within 40 minutes."

.ci/db_backup_ci.sh

Lines changed: 0 additions & 152 deletions
This file was deleted.

0 commit comments

Comments
 (0)