Merge remote-tracking branch 'origin/main' into pedro/rollup_producti…

…on_based_on_size
ten-protocol · Sep 20, 2023 · e93a6af · e93a6af
2 parents 43f9f40 + 1a149de
commit e93a6af
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml
@@ -40,8 +40,8 @@ jobs:
       RESOURCE_TESTNET_NAME: ${{ steps.outputVars.outputs.RESOURCE_TESTNET_NAME }}
       L1_WS_URL: ${{ steps.outputVars.outputs.L1_WS_URL }}
       L1_HTTP_URL: ${{ steps.outputVars.outputs.L1_HTTP_URL }}
-      BATCH_INTERVAL: ${{ steps.deployL2Contracts.outputs.BATCH_INTERVAL }}
-      ROLLUP_INTERVAL: ${{ steps.deployL2Contracts.outputs.ROLLUP_INTERVAL }}
+      BATCH_INTERVAL: ${{ steps.outputVars.outputs.BATCH_INTERVAL }}
+      ROLLUP_INTERVAL: ${{ steps.outputVars.outputs.ROLLUP_INTERVAL }}
 
 
     steps:

diff --git a/.github/workflows/manual-upgrade-testnet-l2.yml b/.github/workflows/manual-upgrade-testnet-l2.yml
@@ -41,8 +41,8 @@ jobs:
       RESOURCE_TESTNET_NAME: ${{ steps.outputVars.outputs.RESOURCE_TESTNET_NAME }}
       L1_WS_URL: ${{ steps.outputVars.outputs.L1_WS_URL }}
       VM_BUILD_NUMBER: ${{ steps.outputVars.outputs.VM_BUILD_NUMBER }}
-      BATCH_INTERVAL: ${{ steps.deployL2Contracts.outputs.BATCH_INTERVAL }}
-      ROLLUP_INTERVAL: ${{ steps.deployL2Contracts.outputs.ROLLUP_INTERVAL }}
+      BATCH_INTERVAL: ${{ steps.outputVars.outputs.BATCH_INTERVAL }}
+      ROLLUP_INTERVAL: ${{ steps.outputVars.outputs.ROLLUP_INTERVAL }}
 
     steps:
       - uses: actions/checkout@v3

diff --git a/testnet/launcher/docker.go b/testnet/launcher/docker.go
@@ -62,6 +62,8 @@ func (t *Testnet) Start() error {
 		node.WithDebugNamespaceEnabled(true),
 		node.WithLogLevel(4),
 		node.WithEdgelessDBImage("ghcr.io/edgelesssys/edgelessdb-sgx-4gb:v0.3.2"), // default edgeless db value
+		node.WithBatchInterval("1s"),
+		node.WithRollupInterval("3s"),
 	)
 
 	sequencerNode := node.NewDockerNode(sequencerNodeConfig)
@@ -102,6 +104,8 @@ func (t *Testnet) Start() error {
 		node.WithDebugNamespaceEnabled(true),
 		node.WithLogLevel(4),
 		node.WithEdgelessDBImage("ghcr.io/edgelesssys/edgelessdb-sgx-4gb:v0.3.2"), // default edgeless db value
+		node.WithBatchInterval("1s"),
+		node.WithRollupInterval("3s"),
 	)
 
 	validatorNode := node.NewDockerNode(validatorNodeConfig)