fix e2e

okx · Oct 20, 2023 · 8c5dbde · 8c5dbde
1 parent 1d6620b
commit 8c5dbde
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/config/config_test.go b/config/config_test.go
@@ -181,8 +181,8 @@ func Test_Defaults(t *testing.T) {
 			expectedValue: types.NewDuration(5 * time.Second),
 		},
 		{
-			path:          "SequenceSender.MaxTxSizeForL1",
-			expectedValue: uint64(131072),
+			path:          "SequenceSender.MaxBatchesForL1",
+			expectedValue: uint64(10),
 		},
 		{
 			path:          "Etherman.URL",

diff --git a/config/default.go b/config/default.go
@@ -116,7 +116,7 @@ MaxTxLifetime = "3h"
 [SequenceSender]
 WaitPeriodSendSequence = "5s"
 LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
-MaxTxSizeForL1 = 1000
+MaxBatchesForL1 = 10
 L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 PrivateKey = {Path = "/pk/sequencer.keystore", Password = "testonly"}
 

diff --git a/config/environments/local/local.node.config.toml b/config/environments/local/local.node.config.toml
@@ -99,7 +99,7 @@ MaxTxLifetime = "3h"
 [SequenceSender]
 WaitPeriodSendSequence = "5s"
 LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
-MaxTxSizeForL1 = 131072
+MaxBatchesForL1 = 10
 L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 PrivateKey = {Path = "/pk/sequencer.keystore", Password = "testonly"}
 

diff --git a/docs/config-file/node-config-doc.html b/docs/config-file/node-config-doc.html
diff --git a/docs/config-file/node-config-doc.md b/docs/config-file/node-config-doc.md
@@ -1838,14 +1838,14 @@ LastBatchVirtualizationTimeMaxWaitPeriod="5s"
 
 **Type:** : `integer`
 
-**Default:** `0`
+**Default:** `10`
 
 **Description:** MaxBatchesForL1 is the maximum amount of batches to be sequenced in a single L1 tx
 
-**Example setting the default value** (0):
+**Example setting the default value** (10):
 ```
 [SequenceSender]
-MaxBatchesForL1=0
+MaxBatchesForL1=10
 ```
 
 ### <a name="SequenceSender_SenderAddress"></a>11.4. `SequenceSender.SenderAddress`

diff --git a/docs/config-file/node-config-schema.json b/docs/config-file/node-config-schema.json
@@ -688,7 +688,7 @@
 				"MaxBatchesForL1": {
 					"type": "integer",
 					"description": "MaxBatchesForL1 is the maximum amount of batches to be sequenced in a single L1 tx",
-					"default": 0
+					"default": 10
 				},
 				"SenderAddress": {
 					"items": {

diff --git a/test/Makefile b/test/Makefile
@@ -227,7 +227,7 @@ test-e2e-group-11: stop ## Runs group 11 e2e tests checking race conditions
 	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -count=1 -race -v -p 1 -timeout 2000s ../ci/e2e-group11/...
 
 
-.PHONY: test-e2e-group-cdk-validium-1
+.PHONY: test-e2e-group-xgon-validium-1
 test-e2e-group-xgon-validium-1: stop ## Runs xgon-validium-1 e2e tests checking race conditions
 	$(RUNSTATEDB)
 	$(RUNPOOLDB)
@@ -236,7 +236,7 @@ test-e2e-group-xgon-validium-1: stop ## Runs xgon-validium-1 e2e tests checking
 	$(RUNZKPROVER)
 	docker ps -a
 	docker logs $(DOCKERCOMPOSEZKPROVER)
-	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -count=1 -race -v -p 1 -timeout 2000s ../ci/e2e-group-cdk-validium-1/...
+	trap '$(STOP)' EXIT; MallocNanoZone=0 go test -count=1 -race -v -p 1 -timeout 2000s ../ci/e2e-group-xgon-validium-1/...
 
 .PHONY: benchmark-sequencer-eth-transfers
 benchmark-sequencer-eth-transfers: stop

diff --git a/test/config/test.node.config.toml b/test/config/test.node.config.toml
@@ -54,7 +54,7 @@ EnableL2SuggestedGasPricePolling = true
 [Synchronizer]
 SyncInterval = "1s"
 SyncChunkSize = 100
-TrustedSequencerURL = "" # If it is empty or not specified, then the value is read from the smc.
+TrustedSequencerURL = "http://xgon-json-rpc:8123" # If it is empty or not specified, then the value is read from the smc.
 
 [Sequencer]
 WaitPeriodPoolIsEmpty = "1s"

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -400,31 +400,31 @@ services:
 
   xgon-permissionless-node-forced-DAC:
     container_name: xgon-permissionless-node-forced-DAC
-    image: cdk-validium-node
+    image: xgon-node
     ports:
       - 8125:8125
     environment:
       - ZKEVM_NODE_ISTRUSTEDSEQUENCER=false
       - ZKEVM_NODE_STATEDB_USER=test_user
       - ZKEVM_NODE_STATEDB_PASSWORD=test_password
       - ZKEVM_NODE_STATEDB_NAME=state_db
-      - ZKEVM_NODE_STATEDB_HOST=cdk-validium-permissionless-db
+      - ZKEVM_NODE_STATEDB_HOST=xgon-permissionless-db
       - ZKEVM_NODE_POOL_DB_USER=test_user
       - ZKEVM_NODE_POOL_DB_PASSWORD=test_password
       - ZKEVM_NODE_POOL_DB_NAME=pool_db
-      - ZKEVM_NODE_POOL_DB_HOST=cdk-validium-permissionless-db
+      - ZKEVM_NODE_POOL_DB_HOST=xgon-permissionless-db
       - ZKEVM_NODE_RPC_PORT=8125
-      - ZKEVM_NODE_RPC_SEQUENCERNODEURI=http://cdk-validium-json-rpc:8123
+      - ZKEVM_NODE_RPC_SEQUENCERNODEURI=http://xgon-json-rpc:8123
       - ZKEVM_NODE_SYNCHRONIZER_TRUSTEDSEQUENCERURL=http://you-cant-touch-this:8123
-      - ZKEVM_NODE_MTCLIENT_URI=cdk-validium-permissionless-prover:50061
-      - ZKEVM_NODE_EXECUTOR_URI=cdk-validium-permissionless-prover:50071
+      - ZKEVM_NODE_MTCLIENT_URI=xgon-permissionless-prover:50061
+      - ZKEVM_NODE_EXECUTOR_URI=xgon-permissionless-prover:50071
     volumes:
       - ./config/test.node.config.toml:/app/config.toml
       - ./config/test.genesis.config.json:/app/genesis.json
     command:
       - "/bin/sh"
       - "-c"
-      - "/app/cdk-validium-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components \"rpc,synchronizer\""
+      - "/app/xgon-node run --network custom --custom-network-file /app/genesis.json --cfg /app/config.toml --components \"rpc,synchronizer\""
   xgon-permissionless-node:
     container_name: xgon-permissionless-node
     image: xgon-node