Fix ut and e2e Test

Makefile

@@ -2,27 +2,60 @@ include version.mk
 
 DOCKER_COMPOSE := docker-compose -f docker-compose.yml
 DOCKER_COMPOSE_STATE_DB := xgon-state-db
+DOCKER_COMPOSE_EVENT_DB := xgon-event-db
 DOCKER_COMPOSE_POOL_DB := xgon-pool-db
 DOCKER_COMPOSE_RPC_DB := xgon-rpc-db
 DOCKER_COMPOSE_BRIDGE_DB := xgon-bridge-db
+DOCKER_COMPOSE_DAC_DB := xgon-data-availability-db
+DOCKER_COMPOSE_REDIS := xgon-bridge-redis
 DOCKER_COMPOSE_ZKEVM_NODE := xgon-node
+
+DOCKER_COMPOSE_SEQ := xgon-sequencer
+DOCKER_COMPOSE_SEQ_SENDER := xgon-sequence-sender
+DOCKER_COMPOSE_L2_GASP := xgon-l2gaspricer
+DOCKER_COMPOSE_AGG := xgon-aggregator
+DOCKER_COMPOSE_RPC := xgon-json-rpc
+DOCKER_COMPOSE_SYNC := xgon-sync
+DOCKER_COMPOSE_ETH_TX_MANAGER := xgon-eth-tx-manager
+
 DOCKER_COMPOSE_L1_NETWORK := xgon-mock-l1-network
 DOCKER_COMPOSE_ZKPROVER := xgon-prover
 DOCKER_COMPOSE_BRIDGE := xgon-bridge-service
+DOCKER_COMPOSE_DA_NODE := xgon-data-availability
+DOCKER_COMPOSE_COIN_KAFKA_NODE := xgon-bridge-coin-kafka
+DOCKER_COMPOSE_ZOOKEEPER := kafka-zookeeper
 
 RUN_STATE_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_STATE_DB)
+RUN_EVENT_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_EVENT_DB)
 RUN_POOL_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_POOL_DB)
 RUN_BRIDGE_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_BRIDGE_DB)
-RUN_DBS := ${RUN_BRIDGE_DB} && ${RUN_STATE_DB} && ${RUN_POOL_DB}
-RUN_NODE := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKEVM_NODE)
+RUN_DAC_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_DAC_DB)
+RUN_REDIS := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_REDIS)
+RUN_DBS := ${RUN_BRIDGE_DB} && ${RUN_STATE_DB} && ${RUN_EVENT_DB} && ${RUN_POOL_DB} && ${RUN_DAC_DB}
+RUN_DA := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_DA_NODE)
+RUN_COIN_KAFKA := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_COIN_KAFKA_NODE)
+RUN_ZOOKEEPER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZOOKEEPER)
+RUN_SEQUENCER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_SEQ)
+RUN_SEQUENCE_SENDER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_SEQ_SENDER)
+RUN_L2_GAS_PRICER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_L2_GASP)
+RUN_AGGREGATOR := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_AGG)
+RUN_JSON_RPC := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_RPC)
+RUN_SYNC := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_SYNC)
+RUN_ETH_TX_MANAGER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ETH_TX_MANAGER)
 RUN_L1_NETWORK := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_L1_NETWORK)
 RUN_ZKPROVER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKPROVER)
 RUN_BRIDGE := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_BRIDGE)
 
 STOP_NODE_DB := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_NODE_DB) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_NODE_DB)
 STOP_BRIDGE_DB := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_BRIDGE_DB) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_BRIDGE_DB)
 STOP_DBS := ${STOP_NODE_DB} && ${STOP_BRIDGE_DB}
-STOP_NODE := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKEVM_NODE) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKEVM_NODE)
+STOP_SEQUENCER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_SEQ) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_SEQ)
+STOP_SEQUENCE_SENDER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_SEQ_SENDER) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_SEQ_SENDER)
+STOP_L2_GAS_PRICER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_L2_GASP) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_L2_GASP)
+STOP_AGGREGATOR := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_AGG) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_AGG)
+STOP_JSON_RPC := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_RPC) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_RPC)
+STOP_SYNC := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_SYNC) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_SYNC)
+STOP_ETH_TX_MANAGER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ETH_TX_MANAGER) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ETH_TX_MANAGER)
 STOP_NETWORK := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_L1_NETWORK) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_L1_NETWORK)
 STOP_ZKPROVER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKPROVER) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKPROVER)
 STOP_BRIDGE := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_BRIDGE) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_BRIDGE)
@@ -94,11 +127,24 @@ stop-dbs: ## Stops the node database
 
 .PHONY: run-node
 run-node: ## Runs the node
-	$(RUN_NODE)
+	$(RUN_ETH_TX_MANAGER)
+	$(RUN_SYNC)
+	sleep 2
+	$(RUN_SEQUENCER)
+	$(RUN_SEQUENCE_SENDER)
+	$(RUN_L2_GAS_PRICER)
+	$(RUN_AGGREGATOR)
+	$(RUN_JSON_RPC)
 
 .PHONY: stop-node
 stop-node: ## Stops the node
-	$(STOP_NODE)
+	$(STOP_SEQUENCER)
+	$(STOP_SEQUENCE_SENDER)
+	$(STOP_JSON_RPC)
+	$(STOP_L2_GAS_PRICER)
+	$(STOP_AGGREGATOR)
+	$(STOP_SYNC)
+	$(STOP_ETH_TX_MANAGER)
 
 .PHONY: run-network
 run-network: ## Runs the l1 network
@@ -134,11 +180,24 @@ restart: stop run ## Executes `make stop` and `make run` commands
 .PHONY: run
 run: stop ## runs all services
 	$(RUN_DBS)
+	$(RUN_REDIS)
+	$(RUN_ZOOKEEPER)
+	sleep 3
+	$(RUN_COIN_KAFKA)
 	$(RUN_L1_NETWORK)
 	sleep 5
 	$(RUN_ZKPROVER)
 	sleep 3
-	$(RUN_NODE)
+	$(RUN_DA)
+	sleep 3
+	$(RUN_SYNC)
+	sleep 2
+	$(RUN_ETH_TX_MANAGER)
+	$(RUN_SEQUENCER)
+	$(RUN_SEQUENCE_SENDER)
+	$(RUN_L2_GAS_PRICER)
+	$(RUN_AGGREGATOR)
+	$(RUN_JSON_RPC)
 	sleep 7
 	$(RUN_BRIDGE)
 
@@ -172,12 +231,12 @@ bench-full: ## benchmark full test
 .PHONY: test-full
 test-full: build-docker stop run ## Runs all tests checking race conditions
 	sleep 3
-	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -race -p 1 -timeout 2400s ./test/e2e/... -count 1 -tags='e2e'
+	trap 'docker logs $(DOCKER_COMPOSE_BRIDGE); $(STOP)' EXIT; MallocNanoZone=0 go test -race -p 1 -timeout 2400s ./test/e2e/... -count 1 -tags='e2e'
 
 .PHONY: test-edge
 test-edge: build-docker stop run ## Runs all tests checking race conditions
 	sleep 3
-	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -race -p 1 -timeout 2400s ./test/e2e/... -count 1 -tags='edge'
+	trap 'docker logs $(DOCKER_COMPOSE_BRIDGE); $(STOP)' EXIT; MallocNanoZone=0 go test -race -p 1 -timeout 2400s ./test/e2e/... -count 1 -tags='edge'
 
 .PHONY: validate
 validate: lint build test-full ## Validates the whole integrity of the code base

cmd/run.go

@@ -4,16 +4,15 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/0xPolygonHermez/zkevm-bridge-service/coinmiddleware"
-	"github.com/0xPolygonHermez/zkevm-bridge-service/localcache"
-	"github.com/0xPolygonHermez/zkevm-bridge-service/redisstorage"
-	"github.com/0xPolygonHermez/zkevm-bridge-service/sentinel"
-
 	"github.com/0xPolygonHermez/zkevm-bridge-service/bridgectrl"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/claimtxman"
+	"github.com/0xPolygonHermez/zkevm-bridge-service/coinmiddleware"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/config"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/db"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/etherman"
+	"github.com/0xPolygonHermez/zkevm-bridge-service/localcache"
+	"github.com/0xPolygonHermez/zkevm-bridge-service/redisstorage"
+	"github.com/0xPolygonHermez/zkevm-bridge-service/sentinel"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/server"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/synchronizer"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/utils/gerror"
@@ -171,42 +170,6 @@ func startServer(ctx *cli.Context) error {
 	return nil
 }
 
-func startKafkaConsumer(ctx *cli.Context) error {
-	c, err := initCommon(ctx)
-	if err != nil {
-		return err
-	}
-
-	redisStorage, err := redisstorage.NewRedisStorage(c.BridgeServer.Redis)
-	if err != nil {
-		log.Error(err)
-		return err
-	}
-
-	// Start the coin middleware kafka consumer
-	log.Debugf("start initializing kafka consumer...")
-	coinKafkaConsumer, err := coinmiddleware.NewKafkaConsumer(c.CoinKafkaConsumer, redisStorage)
-	if err != nil {
-		log.Error(err)
-		return err
-	}
-	log.Debugf("finish initializing kafka consumer")
-	go coinKafkaConsumer.Start(ctx.Context)
-	defer func() {
-		err := coinKafkaConsumer.Close()
-		if err != nil {
-			log.Errorf("close kafka consumer error: %v", err)
-		}
-	}()
-
-	// Wait for an in interrupt.
-	ch := make(chan os.Signal, 1)
-	signal.Notify(ch, os.Interrupt)
-	<-ch
-
-	return nil
-}
-
 func initCommon(ctx *cli.Context) (*config.Config, error) {
 	configFilePath := ctx.String(flagCfg)
 	network := ctx.String(flagNetwork)

coinmiddleware/handler.go

@@ -3,12 +3,13 @@ package coinmiddleware
 import (
 	"context"
 	"encoding/json"
+	"time"
+
 	"github.com/0xPolygonHermez/zkevm-bridge-service/bridgectrl/pb"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/redisstorage"
 	"github.com/0xPolygonHermez/zkevm-node/log"
 	"github.com/IBM/sarama"
 	"github.com/pkg/errors"
-	"time"
 )
 
 const (

coinmiddleware/kafkaconsumer.go

@@ -4,16 +4,17 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"os"
+
 	"github.com/0xPolygonHermez/zkevm-bridge-service/redisstorage"
 	"github.com/0xPolygonHermez/zkevm-node/log"
 	"github.com/IBM/sarama"
 	"github.com/pkg/errors"
-	"os"
 )
 
 // KafkaConsumer provides the interface to consume from coin middleware kafka
 type KafkaConsumer interface {
-	Start(ctx context.Context) error
+	Start(ctx context.Context)
 	Close() error
 }
 
@@ -45,7 +46,7 @@ func NewKafkaConsumer(cfg Config, redisStorage redisstorage.RedisStorage) (Kafka
 		}
 
 		config.Net.TLS.Enable = true
-		config.Net.TLS.Config = &tls.Config{RootCAs: caCertPool, InsecureSkipVerify: true}
+		config.Net.TLS.Config = &tls.Config{RootCAs: caCertPool, InsecureSkipVerify: true} // #nosec
 	}
 
 	client, err := sarama.NewConsumerGroup(cfg.Brokers, cfg.ConsumerGroupID, config)
@@ -60,7 +61,7 @@ func NewKafkaConsumer(cfg Config, redisStorage redisstorage.RedisStorage) (Kafka
 	}, nil
 }
 
-func (c *kafkaConsumerImpl) Start(ctx context.Context) error {
+func (c *kafkaConsumerImpl) Start(ctx context.Context) {
 	log.Debug("starting kafka consumer")
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
@@ -70,14 +71,18 @@ func (c *kafkaConsumerImpl) Start(ctx context.Context) error {
 		err := c.client.Consume(ctx, c.topics, c.handler)
 		if err != nil {
 			log.Errorf("kafka consumer error: %v", err)
-			if errors.Is(err, sarama.ErrClosedConsumerGroup) {
-				err = nil
-			}
-			return errors.Wrap(err, "kafka consumer error")
+			//if errors.Is(err, sarama.ErrClosedConsumerGroup) {
+			//	err = nil
+			//}
+			//err = errors.Wrap(err, "kafka consumer error")
+			//panic(err)
+			return
 		}
 		if err = ctx.Err(); err != nil {
 			log.Errorf("kafka consumer ctx error: %v", err)
-			return errors.Wrap(err, "kafka consumer ctx error")
+			//err = errors.Wrap(err, "kafka consumer ctx error")
+			//panic(err)
+			return
 		}
 	}
 }

config/config.debug.toml

@@ -68,9 +68,9 @@ RootCAPath = "/app/root-ca-cert"
 
 [NetworkConfig]
 GenBlockNumber = 1
-PolygonBridgeAddress = "0xff0EE8ea08cEf5cb4322777F5CC3E8A584B8A4A0"
-PolygonZkEVMGlobalExitRootAddress = "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6"
-L2PolygonBridgeAddresses = ["0xff0EE8ea08cEf5cb4322777F5CC3E8A584B8A4A0"]
+PolygonBridgeAddress = "0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"
+PolygonZkEVMGlobalExitRootAddress = "0xEd236da21Ff62bC7B62608AdB818da49E8549fa7"
+L2PolygonBridgeAddresses = ["0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"]
 
 [NacosConfig]
 NacosUrls = ""

config/config.go

@@ -4,15 +4,15 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"github.com/0xPolygonHermez/zkevm-bridge-service/coinmiddleware"
-	"github.com/0xPolygonHermez/zkevm-bridge-service/nacos"
 	"path/filepath"
 	"strings"
 
 	"github.com/0xPolygonHermez/zkevm-bridge-service/bridgectrl"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/claimtxman"
+	"github.com/0xPolygonHermez/zkevm-bridge-service/coinmiddleware"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/db"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/etherman"
+	"github.com/0xPolygonHermez/zkevm-bridge-service/nacos"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/server"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/synchronizer"
 	"github.com/0xPolygonHermez/zkevm-node/log"

config/config.local.toml

@@ -22,7 +22,7 @@ FreeGas = true
 
 [Etherman]
 L1URL = "http://xgon-mock-l1-network:8545"
-L2URLs = ["http://xgon-node:8123"]
+L2URLs = ["http://xgon-json-rpc:8123"]
 L1ChainId = 5
 L2ChainIds = [1001]
 
@@ -69,9 +69,9 @@ RootCAPath = "/app/root-ca-cert"
 
 [NetworkConfig]
 GenBlockNumber = 1
-PolygonBridgeAddress = "0xff0EE8ea08cEf5cb4322777F5CC3E8A584B8A4A0"
-PolygonZkEVMGlobalExitRootAddress = "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6"
-L2PolygonBridgeAddresses = ["0xff0EE8ea08cEf5cb4322777F5CC3E8A584B8A4A0"]
+PolygonBridgeAddress = "0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"
+PolygonZkEVMGlobalExitRootAddress = "0xEd236da21Ff62bC7B62608AdB818da49E8549fa7"
+L2PolygonBridgeAddresses = ["0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"]
 
 [NacosConfig]
 NacosUrls = ""

config/network.go

@@ -41,9 +41,9 @@ var (
 		},
 		"local": {
 			GenBlockNumber:                    1,
-			PolygonBridgeAddress:              common.HexToAddress("0xff0EE8ea08cEf5cb4322777F5CC3E8A584B8A4A0"),
-			PolygonZkEVMGlobalExitRootAddress: common.HexToAddress("0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6"),
-			L2PolygonBridgeAddresses:          []common.Address{common.HexToAddress("0xff0EE8ea08cEf5cb4322777F5CC3E8A584B8A4A0")},
+			PolygonBridgeAddress:              common.HexToAddress("0x10B65c586f795aF3eCCEe594fE4E38E1F059F780"),
+			PolygonZkEVMGlobalExitRootAddress: common.HexToAddress("0xEd236da21Ff62bC7B62608AdB818da49E8549fa7"),
+			L2PolygonBridgeAddresses:          []common.Address{common.HexToAddress("0x10B65c586f795aF3eCCEe594fE4E38E1F059F780")},
 		},
 	}
 )

db/pgstorage/migrations/0006.sql

@@ -1,5 +1,5 @@
 -- +migrate Down
-DROP SCHEMA IF EXISTS common;
+DROP SCHEMA IF EXISTS common CASCADE;
 
 -- +migrate Up
 CREATE SCHEMA IF NOT EXISTS common;

db/pgstorage/pgstorage.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/0xPolygonHermez/zkevm-bridge-service/bridgectrl/pb"
 	"math/big"
 	"time"
 
+	"github.com/0xPolygonHermez/zkevm-bridge-service/bridgectrl/pb"
 	ctmtypes "github.com/0xPolygonHermez/zkevm-bridge-service/claimtxman/types"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/etherman"
 	"github.com/0xPolygonHermez/zkevm-bridge-service/utils/gerror"