Fix several sync issues

.github/workflows/test-e2e.yml

@@ -13,6 +13,7 @@ jobs:
       matrix:
         go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
+        test: ["e2e", "edge", "multirollup"]
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
@@ -24,4 +25,4 @@ jobs:
       env:
         GOARCH: ${{ matrix.goarch }}
     - name: Test
-      run: make test-full
+      run: make test-${{ matrix.test }}

.gitignore

@@ -18,3 +18,4 @@
 
 config/config.mainnet.toml
 config/config.testnet.toml
+**__debug**

Makefile

@@ -1,45 +1,44 @@
 include version.mk
 
 DOCKER_COMPOSE := docker-compose -f docker-compose.yml
-DOCKER_COMPOSE_STATE_DB := zkevm-state-db
-DOCKER_COMPOSE_POOL_DB := zkevm-pool-db
-DOCKER_COMPOSE_RPC_DB := zkevm-rpc-db
-DOCKER_COMPOSE_BRIDGE_DB := zkevm-bridge-db
-DOCKER_COMPOSE_ZKEVM_NODE := zkevm-node
+DOCKER_COMPOSE_DB := zkevm-db
+DOCKER_COMPOSE_ZKEVM_NODE-1 := zkevm-node-1
+DOCKER_COMPOSE_ZKEVM_NODE-2 := zkevm-node-2
 DOCKER_COMPOSE_ZKEVM_NODE_V1TOV2 := zkevm-node-v1tov2
 DOCKER_COMPOSE_ZKEVM_AGGREGATOR_V1TOV2 := zkevm-aggregator-v1tov2
 DOCKER_COMPOSE_L1_NETWORK := zkevm-mock-l1-network
 DOCKER_COMPOSE_L1_NETWORK_V1TOV2 := zkevm-v1tov2-l1-network
-DOCKER_COMPOSE_ZKPROVER := zkevm-prover
+DOCKER_COMPOSE_ZKPROVER-1 := zkevm-prover-1
+DOCKER_COMPOSE_ZKPROVER-2 := zkevm-prover-2
 DOCKER_COMPOSE_ZKPROVER_V1TOV2 := zkevm-prover-v1tov2
-DOCKER_COMPOSE_BRIDGE := zkevm-bridge-service
+DOCKER_COMPOSE_BRIDGE-1 := zkevm-bridge-service-1
+DOCKER_COMPOSE_BRIDGE-2 := zkevm-bridge-service-2
 DOCKER_COMPOSE_BRIDGE_V1TOV2 := zkevm-bridge-service-v1tov2
 
-RUN_STATE_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_STATE_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_DB := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_DB)
+RUN_NODE_1 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKEVM_NODE-1)
+RUN_NODE_2 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKEVM_NODE-2)
 RUN_NODE_V1TOV2 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKEVM_NODE_V1TOV2)
 RUN_AGGREGATOR_V1TOV2 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKEVM_AGGREGATOR_V1TOV2)
 RUN_L1_NETWORK := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_L1_NETWORK)
 RUN_L1_NETWORK_V1TOV2 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_L1_NETWORK_V1TOV2)
-RUN_ZKPROVER := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKPROVER)
+RUN_ZKPROVER_1 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKPROVER-1)
+RUN_ZKPROVER_2 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKPROVER-2)
 RUN_ZKPROVER_V1TOV2 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_ZKPROVER_V1TOV2)
-RUN_BRIDGE := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_BRIDGE)
+RUN_BRIDGE_1 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_BRIDGE-1)
+RUN_BRIDGE_2 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_BRIDGE-2)
 RUN_BRIDGE_V1TOV2 := $(DOCKER_COMPOSE) up -d $(DOCKER_COMPOSE_BRIDGE_V1TOV2)
 
-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_DB := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_DB) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_DB)
+STOP_NODE := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKEVM_NODE-1) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKEVM_NODE-1)
 STOP_NODE_V1TOV2 := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKEVM_NODE_V1TOV2) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKEVM_NODE_V1TOV2)
 STOP_AGGREGATOR_V1TOV2 := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKEVM_AGGREGATOR_V1TOV2) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKEVM_AGGREGATOR_V1TOV2)
 STOP_NETWORK := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_L1_NETWORK) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_L1_NETWORK)
 STOP_NETWORK_V1TOV2 := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_L1_NETWORK_V1TOV2) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_L1_NETWORK_V1TOV2)
-STOP_ZKPROVER := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKPROVER) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKPROVER)
+STOP_ZKPROVER_1 := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKPROVER-1) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKPROVER-1)
+STOP_ZKPROVER_2 := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKPROVER-2) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKPROVER-2)
 STOP_ZKPROVER_V1TOV2 := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_ZKPROVER_V1TOV2) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_ZKPROVER_V1TOV2)
-STOP_BRIDGE := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_BRIDGE) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_BRIDGE)
+STOP_BRIDGE := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_BRIDGE-1) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_BRIDGE-1)
 STOP_BRIDGE_V1TOV2 := $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE_BRIDGE_V1TOV2) && $(DOCKER_COMPOSE) rm -f $(DOCKER_COMPOSE_BRIDGE_V1TOV2)
 STOP := $(DOCKER_COMPOSE) down --remove-orphans
 
@@ -71,9 +70,9 @@ install-git-hooks: ## Moves hook files to the .git/hooks directory
 
 .PHONY: test
 test: ## Runs only short tests without checking race conditions
-	$(STOP_BRIDGE_DB) || true
-	$(RUN_BRIDGE_DB); sleep 3
-	trap '$(STOP_BRIDGE_DB)' EXIT; go test --cover -short -p 1 ./...
+	$(STOP_DB) || true
+	$(RUN_DB); sleep 3
+	trap '$(STOP_DB)' EXIT; go test --cover -short -p 1 ./...
 
 .PHONY: install-linter
 install-linter: ## Installs the linter
@@ -83,33 +82,17 @@ install-linter: ## Installs the linter
 build-docker: ## Builds a docker image with the zkevm bridge binary
 	docker build -t zkevm-bridge-service -f ./Dockerfile .
 
-.PHONY: run-db-node
-run-db-node: ## Runs the node database
-	$(RUN_NODE_DB)
+.PHONY: run-db
+run-db: ## Runs the node database
+	$(RUN_DB)
 
-.PHONY: stop-db-node
-stop-db-node: ## Stops the node database
-	$(STOP_NODE_DB)
-
-.PHONY: run-db-bridge
-run-db-bridge: ## Runs the node database
-	$(RUN_BRIDGE_DB)
-
-.PHONY: stop-db-bridge
-stop-db-bridge: ## Stops the node database
-	$(STOP_BRIDGE_DB)
-
-.PHONY: run-dbs
-run-dbs: ## Runs the node database
-	$(RUN_DBS)
-
-.PHONY: stop-dbs
-stop-dbs: ## Stops the node database
-	$(STOP_DBS)
+.PHONY: stop-db
+stop-db: ## Stops the node database
+	$(STOP_DB)
 
 .PHONY: run-node
 run-node: ## Runs the node
-	$(RUN_NODE)
+	$(RUN_NODE_1)
 
 .PHONY: stop-node
 stop-node: ## Stops the node
@@ -149,11 +132,11 @@ stop-network-v1tov2: ## Stops the l1 network
 
 .PHONY: run-prover
 run-prover: ## Runs the zk prover
-	$(RUN_ZKPROVER)
+	$(RUN_ZKPROVER_1)
 
 .PHONY: stop-prover
 stop-prover: ## Stops the zk prover
-	$(STOP_ZKPROVER)
+	$(STOP_ZKPROVER_1)
 
 .PHONY: run-prover-v1tov2
 run-prover-v1tov2: ## Runs the zk prover
@@ -165,7 +148,7 @@ stop-prover-v1tov2: ## Stops the zk prover
 
 .PHONY: run-bridge
 run-bridge: ## Runs the bridge service
-	$(RUN_BRIDGE)
+	$(RUN_BRIDGE_1)
 
 .PHONY: stop-bridge
 stop-bridge: ## Stops the bridge service
@@ -188,18 +171,26 @@ restart: stop run ## Executes `make stop` and `make run` commands
 
 .PHONY: run
 run: stop ## runs all services
-	$(RUN_DBS)
+	$(RUN_DB)
 	$(RUN_L1_NETWORK)
 	sleep 5
-	$(RUN_ZKPROVER)
+	$(RUN_ZKPROVER_1)
 	sleep 3
-	$(RUN_NODE)
-	sleep 7
-	$(RUN_BRIDGE)
+	$(RUN_NODE_1)
+	sleep 25
+	$(RUN_BRIDGE_1)
+
+.PHONY: run-2Rollups
+run-2Rollups: run
+	$(RUN_ZKPROVER_2)
+	sleep 3
+	$(RUN_NODE_2)
+	sleep 25
+	$(RUN_BRIDGE_2)
 
 .PHONY: run-v1tov2
 run-v1tov2: stop ## runs all services
-	$(RUN_DBS)
+	$(RUN_DB)
 	$(RUN_L1_NETWORK_V1TOV2)
 	sleep 5
 	$(RUN_ZKPROVER_V1TOV2)
@@ -224,9 +215,9 @@ stop-mockserver: ## Stops the mock bridge service
 
 .PHONY: bench
 bench: ## benchmark test
-	$(STOP_BRIDGE_DB) || true
-	$(RUN_BRIDGE_DB); sleep 3
-	trap '$(STOP_BRIDGE_DB)' EXIT; go test -run=NOTEST -timeout=30m -bench=Small ./test/benchmark/...
+	$(STOP_DB) || true
+	$(RUN_DB); sleep 3
+	trap '$(STOP_DB)' EXIT; go test -run=NOTEST -timeout=30m -bench=Small ./test/benchmark/...
 
 .PHONY: bench-full
 bench-full: export ZKEVM_BRIDGE_DATABASE_PORT = 5432
@@ -236,8 +227,8 @@ bench-full: ## benchmark full test
 	go test -run=NOTEST -bench=Medium . && \
 	go test -run=NOTEST -timeout=30m -bench=Large .
 
-.PHONY: test-full
-test-full: build-docker stop run ## Runs all tests checking race conditions
+.PHONY: test-e2e
+test-e2e: build-docker stop run ## Runs all tests checking race conditions
 	sleep 3
 	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -v -failfast -race -p 1 -timeout 2400s ./test/e2e/... -count 1 -tags='e2e'
 
@@ -246,6 +237,11 @@ test-edge: build-docker stop run ## Runs all tests checking race conditions
 	sleep 3
 	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -v -failfast -race -p 1 -timeout 2400s ./test/e2e/... -count 1 -tags='edge'
 
+.PHONY: test-multirollup
+test-multirollup: build-docker stop run-2Rollups ## Runs all tests checking race conditions
+	sleep 3
+	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -v -failfast -race -p 1 -timeout 2400s ./test/e2e/... -count 1 -tags='multirollup'
+
 .PHONY: validate
 validate: lint build test-full ## Validates the whole integrity of the code base
 

bridgectrl/bridgectrl.go

@@ -61,7 +61,7 @@ func (bt *BridgeController) GetNetworkID(networkID uint) (uint8, error) {
 // AddDeposit adds deposit information to the bridge tree.
 func (bt *BridgeController) AddDeposit(ctx context.Context, deposit *etherman.Deposit, depositID uint64, dbTx pgx.Tx) error {
 	leaf := hashDeposit(deposit)
-	tID, err := bt.GetNetworkID(deposit.NetworkID)
+	tID, err := bt.GetNetworkID(deposit.OriginNetwork)
 	if err != nil {
 		return err
 	}

bridgectrl/bridgectrl_test.go

@@ -64,15 +64,15 @@ func TestBridgeTree(t *testing.T) {
 			require.NoError(t, err)
 			amount, _ := new(big.Int).SetString(testVector.Amount, 0)
 			deposit := &etherman.Deposit{
-				LeafType:           0,
-				OriginalNetwork:    testVector.OriginalNetwork,
-				OriginalAddress:    common.HexToAddress(testVector.TokenAddress),
-				Amount:             amount,
-				DestinationNetwork: testVector.DestinationNetwork,
-				DestinationAddress: common.HexToAddress(testVector.DestinationAddress),
-				BlockID:            blockID,
-				DepositCount:       uint(i),
-				Metadata:           common.FromHex(testVector.Metadata),
+				LeafType:             0,
+				OriginalTokenNetwork: testVector.OriginalNetwork,
+				OriginalTokenAddress: common.HexToAddress(testVector.TokenAddress),
+				Amount:               amount,
+				DestinationNetwork:   testVector.DestinationNetwork,
+				DestinationAddress:   common.HexToAddress(testVector.DestinationAddress),
+				BlockID:              blockID,
+				DepositCount:         uint(i),
+				Metadata:             common.FromHex(testVector.Metadata),
 			}
 			leafHash := hashDeposit(deposit)
 			assert.Equal(t, testVector.ExpectedHash, hex.EncodeToString(leafHash[:]))
@@ -84,7 +84,7 @@ func TestBridgeTree(t *testing.T) {
 			// test reorg
 			orgRoot, err := bt.exitTrees[0].store.GetRoot(ctx, uint(i), 0, nil)
 			require.NoError(t, err)
-			require.NoError(t, store.Reset(ctx, uint64(i), deposit.NetworkID, nil))
+			require.NoError(t, store.Reset(ctx, uint64(i), deposit.OriginNetwork, nil))
 			err = bt.ReorgMT(ctx, uint(i), testVectors[i].OriginalNetwork, nil)
 			require.NoError(t, err)
 			blockID, err = store.AddBlock(context.TODO(), block, nil)

bridgectrl/hash.go

@@ -37,11 +37,11 @@ func generateZeroHashes(height uint8) [][KeyLen]byte {
 func hashDeposit(deposit *etherman.Deposit) [KeyLen]byte {
 	var res [KeyLen]byte
 	origNet := make([]byte, 4) //nolint:gomnd
-	binary.BigEndian.PutUint32(origNet, uint32(deposit.OriginalNetwork))
+	binary.BigEndian.PutUint32(origNet, uint32(deposit.OriginalTokenNetwork))
 	destNet := make([]byte, 4) //nolint:gomnd
 	binary.BigEndian.PutUint32(destNet, uint32(deposit.DestinationNetwork))
 	var buf [KeyLen]byte
 	metaHash := keccak256.Hash(deposit.Metadata)
-	copy(res[:], keccak256.Hash([]byte{deposit.LeafType}, origNet, deposit.OriginalAddress[:], destNet, deposit.DestinationAddress[:], deposit.Amount.FillBytes(buf[:]), metaHash))
+	copy(res[:], keccak256.Hash([]byte{deposit.LeafType}, origNet, deposit.OriginalTokenAddress[:], destNet, deposit.DestinationAddress[:], deposit.Amount.FillBytes(buf[:]), metaHash))
 	return res
 }