From 11e4c335ecba16e3cf4f354530ba81e5cd818a17 Mon Sep 17 00:00:00 2001 From: Matt <98158711+BedrockSquirrel@users.noreply.github.com> Date: Mon, 18 Sep 2023 20:46:58 +0100 Subject: [PATCH 1/2] Add missing interval configs to testnet launcher (#1532) --- testnet/launcher/docker.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testnet/launcher/docker.go b/testnet/launcher/docker.go index 9804d74f8e..68b763f78b 100644 --- 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) From 1a149de7289457d85d9362b70ba48771176eaa10 Mon Sep 17 00:00:00 2001 From: Matt <98158711+BedrockSquirrel@users.noreply.github.com> Date: Tue, 19 Sep 2023 11:58:38 +0100 Subject: [PATCH 2/2] GH yaml typo (#1534) --- .github/workflows/manual-deploy-testnet-l2.yml | 4 ++-- .github/workflows/manual-upgrade-testnet-l2.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml index 36584d1750..7327160c42 100644 --- 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 index a1df6f8203..a5dd8fd26a 100644 --- 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