fix claim pre execution

pool/pool.go

@@ -7,7 +7,6 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/0xPolygonHermez/zkevm-node/log"
 	"github.com/0xPolygonHermez/zkevm-node/state"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
@@ -68,28 +67,11 @@ func (p *Pool) AddTx(ctx context.Context, tx types.Transaction) error {
 		return err
 	}
 
-	poolTx := Transaction{
-		Transaction: tx,
-		Status:      TxStatusPending,
-		IsClaims:    false,
-		ReceivedAt:  time.Now(),
-		IsWIP:       false,
-	}
-
-	poolTx.IsClaims = poolTx.IsClaimTx(p.l2BridgeAddr, p.cfg.FreeClaimGasLimit)
-
-	// Execute transaction to calculate its zkCounters
-	zkCounters, err := p.PreExecuteTx(ctx, tx)
-	if err != nil {
-		return err
-	}
-
-	poolTx.ZKCounters = zkCounters
-	return p.storage.AddTx(ctx, poolTx)
+	return p.StoreTx(ctx, tx)
 }
 
-// ReorgTx adds a reorged transaction to the pool with the pending state
-func (p *Pool) ReorgTx(ctx context.Context, tx types.Transaction) error {
+// StoreTx adds a transaction to the pool with the pending state
+func (p *Pool) StoreTx(ctx context.Context, tx types.Transaction) error {
 	poolTx := Transaction{
 		Transaction: tx,
 		Status:      TxStatusPending,
@@ -100,13 +82,14 @@ func (p *Pool) ReorgTx(ctx context.Context, tx types.Transaction) error {
 
 	poolTx.IsClaims = poolTx.IsClaimTx(p.l2BridgeAddr, p.cfg.FreeClaimGasLimit)
 
-	// Execute transaction to calculate its zkCounters
-	zkCounters, err := p.PreExecuteTx(ctx, tx)
-	if err != nil {
-		log.Warnf("ignoring error while preexecuting tx: %+v", poolTx)
+	if !poolTx.IsClaims {
+		// Execute transaction to calculate its zkCounters
+		zkCounters, err := p.PreExecuteTx(ctx, tx)
+		if err != nil {
+			poolTx.ZKCounters = zkCounters
+		}
 	}
 
-	poolTx.ZKCounters = zkCounters
 	return p.storage.AddTx(ctx, poolTx)
 }
 

state/runtime/executor/errors.go

@@ -226,6 +226,11 @@ func IsExecutorOutOfCountersError(error pb.ExecutorError) bool {
 	return int32(error) >= EXECUTOR_ERROR_COUNTERS_OVERFLOW_KECCAK && int32(error) <= ROM_ERROR_OUT_OF_COUNTERS_POSEIDON
 }
 
+// IsExecutorUnespecifiedError indicates an unespecified error in the executor
+func IsExecutorUnespecifiedError(error pb.ExecutorError) bool {
+	return int32(error) == EXECUTOR_ERROR_UNSPECIFIED
+}
+
 // IsIntrinsicError indicates if the error is due to a intrinsic check
 func IsIntrinsicError(error pb.RomError) bool {
 	return int32(error) >= ROM_ERROR_INTRINSIC_INVALID_SIGNATURE && int32(error) <= ROM_ERROR_INTRINSIC_TX_GAS_OVERFLOW

synchronizer/interfaces.go

@@ -61,5 +61,5 @@ type ethTxManager interface {
 
 type poolInterface interface {
 	DeleteReorgedTransactions(ctx context.Context, txs []*types.Transaction) error
-	ReorgTx(ctx context.Context, tx types.Transaction) error
+	StoreTx(ctx context.Context, tx types.Transaction) error
 }

synchronizer/synchronizer.go

@@ -1143,7 +1143,7 @@ func (s *ClientSynchronizer) reorgPool(dbTx pgx.Tx) error {
 
 	// Add txs to the pool
 	for _, tx := range txs {
-		err = s.pool.ReorgTx(s.ctx, *tx)
+		err = s.pool.StoreTx(s.ctx, *tx)
 		if err != nil {
 			log.Errorf("error storing tx into the pool again. TxHash: %s. BatchNumber: %d, error: %v", tx.Hash().String(), batchNumber, err)
 			return err

synchronizer/synchronizer_test.go

@@ -200,7 +200,7 @@ func TestTrustedStateReorg(t *testing.T) {
 					Once()
 
 				m.Pool.
-					On("ReorgTx", ctx, *txs[0]).
+					On("StoreTx", ctx, *txs[0]).
 					Return(nil).
 					Once()