Fix decoding sequenced batches (provide the correct fork id)

0xPolygon · Mar 12, 2024 · 811e5b3 · 811e5b3
1 parent 8c7f9c8
commit 811e5b3
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/etherman/etherman.go b/etherman/etherman.go
@@ -1285,7 +1285,7 @@ func decodeSequencesElderberry(txData []byte, lastBatchNumber uint64, sequencer
 		return nil, err
 	}
 
-	return decodeSequencedBatches(smcAbi, txData, state.FORKID_ETROG, lastBatchNumber, sequencer, txHash, nonce, l1InfoRoot, da)
+	return decodeSequencedBatches(smcAbi, txData, state.FORKID_ELDERBERRY, lastBatchNumber, sequencer, txHash, nonce, l1InfoRoot, da)
 }
 
 func decodeSequencesEtrog(txData []byte, lastBatchNumber uint64, sequencer common.Address, txHash common.Hash, nonce uint64, l1InfoRoot common.Hash,
@@ -1297,7 +1297,7 @@ func decodeSequencesEtrog(txData []byte, lastBatchNumber uint64, sequencer commo
 		return nil, err
 	}
 
-	return decodeSequencedBatches(smcAbi, txData, state.FORKID_ELDERBERRY, lastBatchNumber, sequencer, txHash, nonce, l1InfoRoot, da)
+	return decodeSequencedBatches(smcAbi, txData, state.FORKID_ETROG, lastBatchNumber, sequencer, txHash, nonce, l1InfoRoot, da)
 }
 
 // decodeSequencedBatches decodes provided data, based on the funcName, whether it is rollup or validium data and returns sequenced batches
@@ -1343,7 +1343,7 @@ func decodeSequencedBatches(smcAbi abi.ABI, txData []byte, forkID uint64, lastBa
 				Coinbase:                        coinbase,
 				PolygonRollupBaseEtrogBatchData: &s,
 			}
-			if forkID == state.FORKID_ELDERBERRY {
+			if forkID >= state.FORKID_ELDERBERRY {
 				batch.SequencedBatchElderberryData = &SequencedBatchElderberryData{
 					MaxSequenceTimestamp:     maxSequenceTimestamp,
 					InitSequencedBatchNumber: initSequencedBatchNumber,
@@ -1385,7 +1385,7 @@ func decodeSequencedBatches(smcAbi abi.ABI, txData []byte, forkID uint64, lastBa
 				Coinbase:                        coinbase,
 				PolygonRollupBaseEtrogBatchData: &s,
 			}
-			if forkID == state.FORKID_ELDERBERRY {
+			if forkID >= state.FORKID_ELDERBERRY {
 				elderberry := &SequencedBatchElderberryData{
 					MaxSequenceTimestamp:     maxSequenceTimestamp,
 					InitSequencedBatchNumber: initSequencedBatchNumber,
@@ -1816,6 +1816,15 @@ func (etherMan *Client) EstimateGas(ctx context.Context, from common.Address, to
 	})
 }
 
+func (etherMan *Client) Call(ctx context.Context, from common.Address, to *common.Address, value *big.Int, data []byte, blockNum *big.Int) ([]byte, error) {
+	return etherMan.EthClient.CallContract(ctx, ethereum.CallMsg{
+		From:  from,
+		To:    to,
+		Value: value,
+		Data:  data,
+	}, blockNum)
+}
+
 // CheckTxWasMined check if a tx was already mined
 func (etherMan *Client) CheckTxWasMined(ctx context.Context, txHash common.Hash) (bool, *types.Receipt, error) {
 	receipt, err := etherMan.EthClient.TransactionReceipt(ctx, txHash)