Skip to content

Commit 642169d

Browse files
committed
feat: if block num in aggregator
1 parent 79a6a33 commit 642169d

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

aggregator/internal/pkg/aggregator.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ func (agg *Aggregator) Start(ctx context.Context) error {
218218

219219
const MaxSentTxRetries = 5
220220

221-
const V2 = false
221+
// const V2 = false
222+
var redeployBlockNumber = uint64(150)
222223

223224
func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsAggregationServiceResponse) {
224225
if blsAggServiceResp.Err != nil {
@@ -281,9 +282,10 @@ func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsA
281282

282283
agg.logger.Info("Sending aggregated response onchain", "taskIndex", blsAggServiceResp.TaskIndex,
283284
"batchIdentifierHash", "0x"+hex.EncodeToString(batchIdentifierHash[:]))
284-
285+
current_task_block := agg.batchCreatedBlockByIdx[blsAggServiceResp.TaskIndex]
285286
for i := 0; i < MaxSentTxRetries; i++ {
286-
if !V2 { //V1
287+
if current_task_block < redeployBlockNumber {
288+
// if !V2 { //V1
287289
agg.logger.Info("agg if V1")
288290
_, err = agg.sendAggregatedResponse(batchData.BatchMerkleRoot, nonSignerStakesAndSignature)
289291
if err == nil {
@@ -296,8 +298,9 @@ func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsA
296298

297299
// Sleep for a bit before retrying
298300
time.Sleep(2 * time.Second)
299-
300-
} else { //V2
301+
302+
} else if current_task_block > redeployBlockNumber {
303+
// } else { //V2
301304
agg.logger.Info("agg if V2")
302305
_, err = agg.sendAggregatedResponseV2(batchData.BatchMerkleRoot, batchData.SenderAddress, nonSignerStakesAndSignature)
303306
if err == nil {

0 commit comments

Comments
 (0)