fix e2e (0xPolygonHermez#1293)

* e2e group 2 fixed

* group 3

Makefile

@@ -150,7 +150,8 @@ test-e2e-group-1: build-docker compile-scs ## Runs group 1 e2e tests checking ra
 	$(RUNSTATEDB)
 	$(RUNPOOLDB)
 	$(RUNRPCDB); sleep 5
-	trap '$(STOPSTATEDB) && $(STOPPOOLDB) && $(STOPRPCDB)' EXIT; MallocNanoZone=0 go test -race -v -p 1 -timeout 600s ./ci/e2e-group1/...
+	$(RUNZKPROVER)
+	trap '$(STOPSTATEDB) && $(STOPPOOLDB) && $(STOPRPCDB) && $(STOPZKPROVER)' EXIT; MallocNanoZone=0 go test -race -v -p 1 -timeout 600s ./ci/e2e-group1/...
 
 .PHONY: test-e2e-group-2
 test-e2e-group-2: build-docker compile-scs ## Runs group 2 e2e tests checking race conditions
@@ -162,6 +163,7 @@ test-e2e-group-2: build-docker compile-scs ## Runs group 2 e2e tests checking ra
 	$(RUNSTATEDB)
 	$(RUNPOOLDB)
 	$(RUNRPCDB); sleep 5
+	${RUNL1NETWORK}
 	CONFIG_MODE="test" $(RUNZKPROVER)
 	docker ps -a
 	docker logs $(DOCKERCOMPOSEZKPROVER)
@@ -176,6 +178,7 @@ test-e2e-group-3: build-docker compile-scs ## Runs group 3 e2e tests checking ra
 	$(RUNSTATEDB)
 	$(RUNPOOLDB)
 	$(RUNRPCDB); sleep 5
+	$(RUNZKPROVER); sleep 2
 	trap '$(STOPSTATEDB) && $(STOPPOOLDB) && $(STOPRPCDB)' EXIT; MallocNanoZone=0 go test -race -v -p 1 -timeout 600s ./ci/e2e-group3/...
 
 .PHONY: install-linter
@@ -311,9 +314,9 @@ run-approve-matic: ## Runs approve in node container
 stop-approve-matic: ## Stops approve in node container
 	$(STOPAPPROVE)
 
-.PHONY: init-network
-init-network: ## Initializes the network
-	go run ./scripts/init_network/main.go .
+#.PHONY: init-network
+#init-network: ## Initializes the network
+#	go run ./scripts/init_network/main.go .
 
 .PHONY: deploy-sc
 deploy-sc: ## deploys some examples of transactions and smart contracts

docker-compose.yml

@@ -89,10 +89,12 @@ services:
     image: zkevm-node
     environment:
       - ZKEVM_NODE_STATEDB_HOST=zkevm-state-db
+      - ZKEVM_NODE_ETHERMAN_PRIVATEKEYPATH=/pk/keystore
     ports:
       - 61090:61090
     volumes:
       - ./config/config.local.toml:/app/config.toml
+      - ./test/test.keystore:/pk/keystore
     command:
       - "/bin/sh"
       - "-c"

test/operations/manager.go

@@ -52,7 +52,7 @@ const (
 var (
 	stateDBCfg       = dbutils.NewStateConfigFromEnv()
 	poolDBCfg        = dbutils.NewPoolConfigFromEnv()
-	rpcDBCfg         = dbutils.NewPoolConfigFromEnv()
+	rpcDBCfg         = dbutils.NewRPCConfigFromEnv()
 	executorConfig   = executor.Config{URI: executorURI}
 	merkletreeConfig = merkletree.Config{URI: merkletreeURI}
 )
@@ -397,7 +397,7 @@ func (m *Manager) SetUpSequencer() error {
 		return err
 	}
 
-	if b.Cmp(maticAmount) <= 0 {
+	if b.Cmp(maticAmount) < 0 {
 		return fmt.Errorf("Minimum amount is: %v but found: %v", maticAmount.Text(encoding.Base10), b.Text(encoding.Base10))
 	}