Custom EthTxManager on agglayer

Makefile

@@ -62,6 +62,12 @@ LDFLAGS += -X 'github.com/0xPolygon/agglayer.GitRev=$(GITREV)'
 LDFLAGS += -X 'github.com/0xPolygon/agglayer.GitBranch=$(GITBRANCH)'
 LDFLAGS += -X 'github.com/0xPolygon/agglayer.BuildDate=$(DATE)'
 
+DOCKERCOMPOSE := docker-compose -f docker/docker-compose.yaml
+DOCKERCOMPOSESTATEDB := agglayer-db
+
+RUNSTATEDB := $(DOCKERCOMPOSE) up -d $(DOCKERCOMPOSESTATEDB)
+STOP := $(DOCKERCOMPOSE) down --remove-orphans
+
 .PHONY: build
 build: ## Builds the binary locally into ./dist
 	$(GOENVVARS) go build -ldflags "all=$(LDFLAGS)" -o $(GOBIN)/$(GOBINARY) $(GOCMD)
@@ -111,13 +117,19 @@ help: ## Prints the help
 		| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: e2e-tests
-e2e-tests: ## Runs E2E tests
+e2e-tests: stop ## Runs E2E tests
 	go test -v -timeout=30m github.com/0xPolygon/agglayer/test
 
 .PHONY: unit-tests
-unit-tests: ## Runs unit tests
-	go test -v -timeout=5m -race -shuffle=on -coverprofile coverage.out `go list ./... | grep -v test`
+unit-tests: stop ## Runs unit tests
+	$(RUNSTATEDB)
+	sleep 40
+	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -v -timeout=5m -race -shuffle=on -coverprofile coverage.out `go list ./... | grep -v test`
 
 .PHONY: generate-mocks
 generate-mocks: ## Generates mocks and other autogenerated types
 	mockery
+
+.PHONY: stop
+stop: ## Stops all services
+	$(STOP)

cmd/main.go

@@ -12,7 +12,6 @@ import (
 
 	jRPC "github.com/0xPolygon/cdk-rpc/rpc"
 	dbConf "github.com/0xPolygonHermez/zkevm-node/db"
-	"github.com/0xPolygonHermez/zkevm-node/ethtxmanager"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -35,6 +34,7 @@ import (
 	"github.com/0xPolygon/agglayer/log"
 	"github.com/0xPolygon/agglayer/network"
 	"github.com/0xPolygon/agglayer/rpc"
+	"github.com/0xPolygon/agglayer/txmanager"
 )
 
 const appName = "cdk-agglayer"
@@ -131,11 +131,11 @@ func start(cliCtx *cli.Context) error {
 	}
 
 	// Prepare EthTxMan client
-	ethTxManagerStorage, err := ethtxmanager.NewPostgresStorage(c.DB)
+	ethTxManagerStorage, err := txmanager.NewPostgresStorage(c.DB)
 	if err != nil {
 		return err
 	}
-	etm := ethtxmanager.New(c.EthTxManager.Config, &ethMan, ethTxManagerStorage, &ethMan)
+	etm := txmanager.New(c.EthTxManager, &ethMan, ethTxManagerStorage, &ethMan)
 
 	// Create opentelemetry metric provider
 	meterProvider, err := createMeterProvider()

config/config.go

@@ -51,6 +51,7 @@ type EthTxManagerConfig struct {
 	GasOffset            uint64         `mapstructure:"GasOffset"`
 	KMSKeyName           string         `mapstructure:"KMSKeyName"`
 	KMSConnectionTimeout types.Duration `mapstructure:"KMSConnectionTimeout"`
+	MaxRetries           uint64         `mapstructure:"MaxRetries"`
 }
 
 // Load loads the configuration baseed on the cli context

config/default.go

@@ -45,6 +45,7 @@ const DefaultValues = `
 	KMSKeyName = "gcp/resource/id"
 	KMSConnectionTimeout = "30s"
 	GasOffset = 100000
+	MaxRetries = 10
 
 [L1]
 	ChainID = 1337

db/migrations/0002.sql

@@ -0,0 +1,6 @@
+-- +migrate Up
+ALTER TABLE state.monitored_txs
+ADD COLUMN num_retries DECIMAL(78, 0) NOT NULL DEFAULT 0;
+
+-- +migrate Down
+ALTER TABLE state.monitored_txs DROP COLUMN num_retries;

docker/data/agglayer/agglayer.toml

@@ -34,6 +34,7 @@
 	GasOffset = 100000
 	KMSKeyName = ""
 	KMSConnectionTimeout = "30s"
+	MaxRetries = 10
 
 [L1]
 	ChainID = 1337

interop/executor.go

@@ -172,7 +172,7 @@ func (e *Executor) Execute(ctx context.Context, signedTx tx.SignedTx) error {
 
 	if batch.StateRoot != signedTx.Tx.ZKP.NewStateRoot || batch.LocalExitRoot != signedTx.Tx.ZKP.NewLocalExitRoot {
 		return fmt.Errorf(
-			"Mismatch detected, expected local exit root: %s actual: %s. expected state root: %s actual: %s",
+			"mismatch detected, expected local exit root: %s actual: %s. expected state root: %s actual: %s",
 			signedTx.Tx.ZKP.NewLocalExitRoot.Hex(),
 			batch.LocalExitRoot.Hex(),
 			signedTx.Tx.ZKP.NewStateRoot.Hex(),

interop/executor_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/0xPolygon/agglayer/log"
+	txmTypes "github.com/0xPolygon/agglayer/txmanager/types"
 	jRPC "github.com/0xPolygon/cdk-rpc/rpc"
-	"github.com/0xPolygonHermez/zkevm-node/ethtxmanager"
 	rpctypes "github.com/0xPolygonHermez/zkevm-node/jsonrpc/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -313,9 +313,9 @@ func TestExecutor_GetTxStatus(t *testing.T) {
 	expectedError := jRPC.NewRPCError(rpctypes.DefaultErrorCode, "failed to get tx, error: sampleError")
 
 	ethTxManager.On("Result", mock.Anything, ethTxManOwner, hash.Hex(), dbTx).
-		Return(ethtxmanager.MonitoredTxResult{
+		Return(txmTypes.MonitoredTxResult{
 			ID:     "0x1",
-			Status: ethtxmanager.MonitoredTxStatus("0x1"),
+			Status: txmTypes.MonitoredTxStatus("0x1"),
 		}, nil).Once()
 
 	result, err := executor.GetTxStatus(context.Background(), hash, dbTx)
@@ -324,9 +324,9 @@ func TestExecutor_GetTxStatus(t *testing.T) {
 	assert.NoError(t, err)
 
 	ethTxManager.On("Result", mock.Anything, ethTxManOwner, hash.Hex(), dbTx).
-		Return(ethtxmanager.MonitoredTxResult{
+		Return(txmTypes.MonitoredTxResult{
 			ID:     "0x0",
-			Status: ethtxmanager.MonitoredTxStatus("0x1"),
+			Status: txmTypes.MonitoredTxStatus("0x1"),
 		}, errors.New("sampleError")).Once()
 
 	result, err = executor.GetTxStatus(context.Background(), hash, dbTx)