From fd7766168b71b35c20b50f8ab8f3023a3264926a Mon Sep 17 00:00:00 2001 From: Victor Castell <0x@vcastellm.xyz> Date: Mon, 7 Oct 2024 13:52:00 +0000 Subject: [PATCH 1/6] feat: use cdk entrypoint --- lib/cdk_node.star | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cdk_node.star b/lib/cdk_node.star index 98615d1d..79c36ba8 100644 --- a/lib/cdk_node.star +++ b/lib/cdk_node.star @@ -38,10 +38,10 @@ def create_cdk_node_service_config( # Sleep for 20 seconds in order to wait for datastream server getting ready # TODO: find a better way instead of waiting cmd=[ - "sleep 20 && cdk-node run " - + "-cfg=/etc/cdk/cdk-node-config.toml " - + "-custom-network-file=/etc/cdk/genesis.json " - + "-components=" + "sleep 20 && cdk node " + + "--config=/etc/cdk/cdk-node-config.toml " + + "--chain=/etc/cdk/genesis.json " + + "--components=" + NODE_COMPONENTS.sequence_sender + "," + NODE_COMPONENTS.aggregator, From 5ae06fb0b1edd8eea9016a321393218c249db71b Mon Sep 17 00:00:00 2001 From: Victor Castell <0x@vcastellm.xyz> Date: Mon, 7 Oct 2024 15:48:12 +0000 Subject: [PATCH 2/6] feat: use cdk node entrypoint --- lib/cdk_node.star | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/cdk_node.star b/lib/cdk_node.star index 79c36ba8..400dc0c7 100644 --- a/lib/cdk_node.star +++ b/lib/cdk_node.star @@ -38,9 +38,10 @@ def create_cdk_node_service_config( # Sleep for 20 seconds in order to wait for datastream server getting ready # TODO: find a better way instead of waiting cmd=[ - "sleep 20 && cdk node " + "sleep 20 && cdk " + "--config=/etc/cdk/cdk-node-config.toml " + "--chain=/etc/cdk/genesis.json " + + "node " + "--components=" + NODE_COMPONENTS.sequence_sender + "," From b06e6ea6808d0577e1d8a6514b8ec8d72c38e2b9 Mon Sep 17 00:00:00 2001 From: Victor Castell <0x@vcastellm.xyz> Date: Wed, 9 Oct 2024 08:13:52 +0000 Subject: [PATCH 3/6] chore: bump cdk version --- input_parser.star | 2 +- params.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/input_parser.star b/input_parser.star index 93b03a3f..95f46b4e 100644 --- a/input_parser.star +++ b/input_parser.star @@ -10,7 +10,7 @@ DEFAULT_ARGS = { "zkevm_prover_image": "hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12", "zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.3-RC1", "cdk_validium_node_image": "0xpolygon/cdk-validium-node:0.7.0-cdk", - "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.2.1", + "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.3.0-beta1", "zkevm_da_image": "0xpolygon/cdk-data-availability:0.0.10", "agglayer_image": "ghcr.io/agglayer/agglayer-rs:pr-96", "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC1", diff --git a/params.yml b/params.yml index 5b868b28..c8c35c36 100644 --- a/params.yml +++ b/params.yml @@ -71,7 +71,7 @@ args: zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1 cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk - cdk_node_image: ghcr.io/0xpolygon/cdk:0.2.1 + cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta1 zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10 # agglayer_image: nulyjkdhthz/agglayer-rs:pr-318 agglayer_image: ghcr.io/agglayer/agglayer-rs:pr-96 From 35db444761b9b36f8cf31366f85d485158663415 Mon Sep 17 00:00:00 2001 From: Victor Castell <0x@vcastellm.xyz> Date: Wed, 9 Oct 2024 11:05:44 +0000 Subject: [PATCH 4/6] chore: bump cdk --- input_parser.star | 2 +- params.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/input_parser.star b/input_parser.star index 95f46b4e..d6ee4b65 100644 --- a/input_parser.star +++ b/input_parser.star @@ -10,7 +10,7 @@ DEFAULT_ARGS = { "zkevm_prover_image": "hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12", "zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.3-RC1", "cdk_validium_node_image": "0xpolygon/cdk-validium-node:0.7.0-cdk", - "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.3.0-beta1", + "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.3.0-beta2", "zkevm_da_image": "0xpolygon/cdk-data-availability:0.0.10", "agglayer_image": "ghcr.io/agglayer/agglayer-rs:pr-96", "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC1", diff --git a/params.yml b/params.yml index c8c35c36..0e0a108d 100644 --- a/params.yml +++ b/params.yml @@ -71,7 +71,7 @@ args: zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1 cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk - cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta1 + cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta2 zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10 # agglayer_image: nulyjkdhthz/agglayer-rs:pr-318 agglayer_image: ghcr.io/agglayer/agglayer-rs:pr-96 From e6161eb24f530bb4fcd18a9254c31f48a684491d Mon Sep 17 00:00:00 2001 From: Victor Castell <0x@vcastellm.xyz> Date: Wed, 9 Oct 2024 14:31:28 +0000 Subject: [PATCH 5/6] ci: set the correct version in agglayer attach --- agglayer-attach-cdk-params.yml | 2 +- input_parser.star | 2 +- params.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agglayer-attach-cdk-params.yml b/agglayer-attach-cdk-params.yml index 99e8dfc2..3f8b8155 100644 --- a/agglayer-attach-cdk-params.yml +++ b/agglayer-attach-cdk-params.yml @@ -71,7 +71,7 @@ args: zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1 cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk - cdk_node_image: ghcr.io/0xpolygon/cdk:0.2.1 + cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta3 zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10 # agglayer_image: nulyjkdhthz/agglayer-rs:pr-318 agglayer_image: ghcr.io/agglayer/agglayer-rs:pr-96 diff --git a/input_parser.star b/input_parser.star index d6ee4b65..e9f99bc4 100644 --- a/input_parser.star +++ b/input_parser.star @@ -10,7 +10,7 @@ DEFAULT_ARGS = { "zkevm_prover_image": "hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12", "zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.3-RC1", "cdk_validium_node_image": "0xpolygon/cdk-validium-node:0.7.0-cdk", - "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.3.0-beta2", + "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.3.0-beta3", "zkevm_da_image": "0xpolygon/cdk-data-availability:0.0.10", "agglayer_image": "ghcr.io/agglayer/agglayer-rs:pr-96", "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC1", diff --git a/params.yml b/params.yml index 0e0a108d..4745bcf9 100644 --- a/params.yml +++ b/params.yml @@ -71,7 +71,7 @@ args: zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1 cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk - cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta2 + cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta3 zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10 # agglayer_image: nulyjkdhthz/agglayer-rs:pr-318 agglayer_image: ghcr.io/agglayer/agglayer-rs:pr-96 From 86ffb3ab886bb3bca65414012acf5c1dcc091eb5 Mon Sep 17 00:00:00 2001 From: Victor Castell <0x@vcastellm.xyz> Date: Thu, 10 Oct 2024 15:17:22 +0200 Subject: [PATCH 6/6] chore: bump cdk --- agglayer-attach-cdk-params.yml | 2 +- input_parser.star | 2 +- lib/cdk_node.star | 3 +-- params.yml | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/agglayer-attach-cdk-params.yml b/agglayer-attach-cdk-params.yml index 3f8b8155..c829bcc5 100644 --- a/agglayer-attach-cdk-params.yml +++ b/agglayer-attach-cdk-params.yml @@ -71,7 +71,7 @@ args: zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1 cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk - cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta3 + cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta4 zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10 # agglayer_image: nulyjkdhthz/agglayer-rs:pr-318 agglayer_image: ghcr.io/agglayer/agglayer-rs:pr-96 diff --git a/input_parser.star b/input_parser.star index e9f99bc4..fdf6a35b 100644 --- a/input_parser.star +++ b/input_parser.star @@ -10,7 +10,7 @@ DEFAULT_ARGS = { "zkevm_prover_image": "hermeznetwork/zkevm-prover:v8.0.0-RC12-fork.12", "zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.3-RC1", "cdk_validium_node_image": "0xpolygon/cdk-validium-node:0.7.0-cdk", - "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.3.0-beta3", + "cdk_node_image": "ghcr.io/0xpolygon/cdk:0.3.0-beta4", "zkevm_da_image": "0xpolygon/cdk-data-availability:0.0.10", "agglayer_image": "ghcr.io/agglayer/agglayer-rs:pr-96", "zkevm_bridge_service_image": "hermeznetwork/zkevm-bridge-service:v0.6.0-RC1", diff --git a/lib/cdk_node.star b/lib/cdk_node.star index 400dc0c7..66aaa34e 100644 --- a/lib/cdk_node.star +++ b/lib/cdk_node.star @@ -39,9 +39,8 @@ def create_cdk_node_service_config( # TODO: find a better way instead of waiting cmd=[ "sleep 20 && cdk " - + "--config=/etc/cdk/cdk-node-config.toml " - + "--chain=/etc/cdk/genesis.json " + "node " + + "--config=/etc/cdk/cdk-node-config.toml " + "--components=" + NODE_COMPONENTS.sequence_sender + "," diff --git a/params.yml b/params.yml index 4745bcf9..5a173d89 100644 --- a/params.yml +++ b/params.yml @@ -71,7 +71,7 @@ args: zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1 cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk - cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta3 + cdk_node_image: ghcr.io/0xpolygon/cdk:0.3.0-beta4 zkevm_da_image: 0xpolygon/cdk-data-availability:0.0.10 # agglayer_image: nulyjkdhthz/agglayer-rs:pr-318 agglayer_image: ghcr.io/agglayer/agglayer-rs:pr-96