From 0ac6d58142eec5507d1bb75a4619c10f8315bf2c Mon Sep 17 00:00:00 2001 From: tenequm Date: Wed, 2 Oct 2024 15:59:10 +0100 Subject: [PATCH 1/6] feat: add `gasp-syncer` Helm chart --- ops/helm-charts/gasp-syncer/.helmignore | 23 +++++++ ops/helm-charts/gasp-syncer/Chart.yaml | 5 ++ .../gasp-syncer/templates/_helpers.tpl | 27 ++++++++ .../gasp-syncer/templates/deployment.yaml | 68 +++++++++++++++++++ .../gasp-syncer/templates/secret.yaml | 9 +++ ops/helm-charts/gasp-syncer/values.yaml | 45 ++++++++++++ 6 files changed, 177 insertions(+) create mode 100644 ops/helm-charts/gasp-syncer/.helmignore create mode 100644 ops/helm-charts/gasp-syncer/Chart.yaml create mode 100644 ops/helm-charts/gasp-syncer/templates/_helpers.tpl create mode 100644 ops/helm-charts/gasp-syncer/templates/deployment.yaml create mode 100644 ops/helm-charts/gasp-syncer/templates/secret.yaml create mode 100644 ops/helm-charts/gasp-syncer/values.yaml diff --git a/ops/helm-charts/gasp-syncer/.helmignore b/ops/helm-charts/gasp-syncer/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/ops/helm-charts/gasp-syncer/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/ops/helm-charts/gasp-syncer/Chart.yaml b/ops/helm-charts/gasp-syncer/Chart.yaml new file mode 100644 index 00000000..102f6cf5 --- /dev/null +++ b/ops/helm-charts/gasp-syncer/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v2 +name: gasp-syncer +description: gasp-syncer Helm chart for Kubernetes +type: application +version: 0.1.0 diff --git a/ops/helm-charts/gasp-syncer/templates/_helpers.tpl b/ops/helm-charts/gasp-syncer/templates/_helpers.tpl new file mode 100644 index 00000000..ff276bb5 --- /dev/null +++ b/ops/helm-charts/gasp-syncer/templates/_helpers.tpl @@ -0,0 +1,27 @@ +{{/* +Useful links: +https://itnext.io/helm-reusable-chart-named-templates-and-a-generic-chart-for-multiple-applications-13d9b26e9244 +https://www.replex.io/blog/9-best-practices-and-examples-for-working-with-kubernetes-labels +*/}} + +{{/* +Expand the name of the chart. +*/}} +{{- define "app.name" -}} +{{- default .Release.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "app.labels" -}} +{{ include "app.selectorLabels" . }} +heritage: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "app.selectorLabels" -}} +application: {{ include "app.name" . }} +{{- end }} \ No newline at end of file diff --git a/ops/helm-charts/gasp-syncer/templates/deployment.yaml b/ops/helm-charts/gasp-syncer/templates/deployment.yaml new file mode 100644 index 00000000..f1883f33 --- /dev/null +++ b/ops/helm-charts/gasp-syncer/templates/deployment.yaml @@ -0,0 +1,68 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "app.name" . }} + labels: {{- include "app.labels" . | nindent 4 }} + service: {{ include "app.name" . }} +spec: + replicas: 1 + selector: + matchLabels: + {{- include "app.selectorLabels" . | nindent 6 }} + service: {{ include "app.name" . }} + template: + metadata: + annotations: + checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "app.labels" . | nindent 8 }} + service: {{ include "app.name" . }} + spec: + containers: + - name: app + image: "{{ .Values.image.repository}}:{{ .Values.image.tag }}" + imagePullPolicy: Always + {{- if .Values.command }} + command: + {{- range .Values.command }} + - {{ . }} + {{- end }} + {{- end }} + {{- if .Values.args }} + args: + {{- range .Values.args }} + - {{ . }} + {{- end }} + {{- end }} + {{- if or .Values.env .Values.envSecrets }} + env: + {{- range $key, $val := .Values.env }} + - name: {{ $key }} + value: {{ $val | quote }} + {{- end }} + {{- range $key, $val := .Values.envSecrets }} + - name: {{ $key }} + valueFrom: + secretKeyRef: + name: "{{ include "app.name" $ }}-secret" + key: {{ $key }} + {{- end }} + {{- end }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 10 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/ops/helm-charts/gasp-syncer/templates/secret.yaml b/ops/helm-charts/gasp-syncer/templates/secret.yaml new file mode 100644 index 00000000..34209625 --- /dev/null +++ b/ops/helm-charts/gasp-syncer/templates/secret.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: v1 +kind: Secret +metadata: + name: "{{ include "node.name" . }}-secret" +data: + {{- range $key, $val := .Values.envSecrets }} + {{ $key }}: {{ $val | b64enc | quote }} + {{- end }} \ No newline at end of file diff --git a/ops/helm-charts/gasp-syncer/values.yaml b/ops/helm-charts/gasp-syncer/values.yaml new file mode 100644 index 00000000..bfe89e86 --- /dev/null +++ b/ops/helm-charts/gasp-syncer/values.yaml @@ -0,0 +1,45 @@ +# Default values for gasp-syncer. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. +environment: local +command: [] +args: [] + +# Randomly generated key, should not be used for anything +walletPrivateKey: 15cb3150921ee606d71b9def1b6392c9df1d4fea399cbcca2047d9cf84f44f08 +ethChainUrl: wss://ethereum.publicnode.com +## Environment variables +env: + MANGATA_NODE_URL: wss://collator-01-ws-rococo.mangata.online + EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" + MANGATA_CONTRACT_ADDRESS: "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650" + +nameOverride: "" + +image: + repository: mangatasolutions/rollup-updater + pullPolicy: Always + ## Overrides the image tag whose default is the chart appVersion. + tag: latest + +resources: + {} + # requests: + # cpu: 200m + # memory: 1Gi + # limits: + # cpu: 1000m + # memory: 2Gi + +# -- Define which Nodes the Pods are scheduled on +nodeSelector: {} +# -- Grace termination period of the Pod +terminationGracePeriodSeconds: 60 +# -- Tolerations for use with node taints +tolerations: [] +# -- Assign custom affinity rules +affinity: {} + +podAnnotations: + {} + # 'fluentbit.io/parser': 'substrate' From f9db3da9f5568ecb9524c39377dfaa0264a7e735 Mon Sep 17 00:00:00 2001 From: tenequm Date: Wed, 2 Oct 2024 16:58:33 +0100 Subject: [PATCH 2/6] feat: add gasp-syncer Helmfile configs and removed references for rollup-updater deployment --- gasp-syncer/Dockerfile | 2 ++ gasp-syncer/compose.yml | 27 +++++++-------- ops/helm-charts/gasp-syncer/values.yaml | 24 +++++++++---- ops/helmfiles/config/default.yaml | 39 +++++++++------------ ops/helmfiles/config/dev.yaml | 39 +++++++++------------ ops/helmfiles/config/frontend.yaml | 39 +++++++++------------ ops/helmfiles/config/fungible.yaml | 46 ++++++++++--------------- ops/helmfiles/config/holesky.yaml | 43 +++++++++-------------- ops/helmfiles/helmfile.yaml | 28 ++++----------- ops/helmfiles/secrets.enc.yaml | 7 ++-- 10 files changed, 130 insertions(+), 164 deletions(-) diff --git a/gasp-syncer/Dockerfile b/gasp-syncer/Dockerfile index e92917a6..55cb9799 100644 --- a/gasp-syncer/Dockerfile +++ b/gasp-syncer/Dockerfile @@ -5,6 +5,8 @@ RUN apt-get install -y ca-certificates WORKDIR /app +ENV RUST_LOG=info + ARG BINARY_PATH=target/release/main COPY ./${BINARY_PATH} ./ diff --git a/gasp-syncer/compose.yml b/gasp-syncer/compose.yml index 99885837..0ff4d81d 100644 --- a/gasp-syncer/compose.yml +++ b/gasp-syncer/compose.yml @@ -15,17 +15,16 @@ services: condition: service_completed_successfully platform: linux/amd64 environment: - - RUST_LOG=info - - SOURCE_RPC_URL=${ETH_RPC_URL:-http://eth-stub:8545} - - SOURCE_WS_URL=${ETH_WS_URL:-ws://eth-stub:8545} - - TARGET_RPC_URL=${ETH_RPC_URL:-http://arbitrum-stub:8546} - - TARGET_WS_URL=${ETH_WS_URL:-ws://arbitrum-stub:8546} - - SOURCE_CHAIN_ID=31337 - - TARGET_CHAIN_ID=31337 - - AVS_REGISTRY_COORDINATOR_ADDR=0x851356ae760d987E095750cCeb3bC6014560891C - - GASP_SERVICE_ADDR=0x610178dA211FEF7D417bC0e6FeD39F05609AD788 - - TESTNET=true - - PUSH_FIRST_INIT=true - - ECDSA_KEY_JSON={"address":"a0ee7a142d267c1f36714e4a8f75612f20a79720","crypto":{"cipher":"aes-128-ctr","ciphertext":"b0f6f8e3ba33f0b382b080de6661d827181de480f1a4f94bc20d66cb3d585907","cipherparams":{"iv":"4e3f9a8ca6ef8d1cd408e8aaae3c22d2"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"c8f9f8cc03913e09cee7e1fd68732fac327576203ab277d740270f1dea82ee7e"},"mac":"353d65850b20d5fdb90ca2385c52e5b57662cb1d906fd58143f20a7720723cf6"},"id":"d3036cc7-d068-4f2f-9667-60aaca660e61","version":3} - - ROOT_ECDSA_KEY_JSON={"address":"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"26e1ebd941909ddb0ebaec8235470c8d"},"ciphertext":"adca2a84713f50c3918235e109a9b4b28ff6c8ea77b87e8aca20dc48a3a93389","kdf":"scrypt","kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"b5581b95b5c7f1449cc341db8567d4c92e4fe21bc34052dbe60bd3e2060a74a0"},"mac":"3643a9e1c0381e30ca0e250999810ecb4b213bc93bd19ad673b93870c77f55ec"},"id":"d39afde8-e06c-46d4-a7ed-1af9bb3f55a5","version":3} - - TARGET_CHAIN_INDEX=1 + SOURCE_RPC_URL: ${ETH_RPC_URL:-http://eth-stub:8545} + SOURCE_WS_URL: ${ETH_WS_URL:-ws://eth-stub:8545} + TARGET_RPC_URL: ${ETH_RPC_URL:-http://arbitrum-stub:8546} + TARGET_WS_URL: ${ETH_WS_URL:-ws://arbitrum-stub:8546} + SOURCE_CHAIN_ID: 31337 + TARGET_CHAIN_ID: 31337 + AVS_REGISTRY_COORDINATOR_ADDR: 0x851356ae760d987E095750cCeb3bC6014560891C + GASP_SERVICE_ADDR: 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 + TESTNET: true + PUSH_FIRST_INIT: true + ECDSA_KEY_JSON: '{"address":"a0ee7a142d267c1f36714e4a8f75612f20a79720","crypto":{"cipher":"aes-128-ctr","ciphertext":"b0f6f8e3ba33f0b382b080de6661d827181de480f1a4f94bc20d66cb3d585907","cipherparams":{"iv":"4e3f9a8ca6ef8d1cd408e8aaae3c22d2"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"c8f9f8cc03913e09cee7e1fd68732fac327576203ab277d740270f1dea82ee7e"},"mac":"353d65850b20d5fdb90ca2385c52e5b57662cb1d906fd58143f20a7720723cf6"},"id":"d3036cc7-d068-4f2f-9667-60aaca660e61","version":3}' + ROOT_ECDSA_KEY_JSON: '{"address":"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"26e1ebd941909ddb0ebaec8235470c8d"},"ciphertext":"adca2a84713f50c3918235e109a9b4b28ff6c8ea77b87e8aca20dc48a3a93389","kdf":"scrypt","kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"b5581b95b5c7f1449cc341db8567d4c92e4fe21bc34052dbe60bd3e2060a74a0"},"mac":"3643a9e1c0381e30ca0e250999810ecb4b213bc93bd19ad673b93870c77f55ec"},"id":"d39afde8-e06c-46d4-a7ed-1af9bb3f55a5","version":3}' + TARGET_CHAIN_INDEX: 1 diff --git a/ops/helm-charts/gasp-syncer/values.yaml b/ops/helm-charts/gasp-syncer/values.yaml index bfe89e86..7c831ae7 100644 --- a/ops/helm-charts/gasp-syncer/values.yaml +++ b/ops/helm-charts/gasp-syncer/values.yaml @@ -5,19 +5,29 @@ environment: local command: [] args: [] -# Randomly generated key, should not be used for anything -walletPrivateKey: 15cb3150921ee606d71b9def1b6392c9df1d4fea399cbcca2047d9cf84f44f08 -ethChainUrl: wss://ethereum.publicnode.com ## Environment variables env: - MANGATA_NODE_URL: wss://collator-01-ws-rococo.mangata.online - EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - MANGATA_CONTRACT_ADDRESS: "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650" + SOURCE_RPC_URL: http://evm-node-eth:8545 + SOURCE_WS_URL: ws://evm-node-eth:8546 + TARGET_RPC_URL: http://evm-node-arb:8545 + TARGET_WS_URL: ws://evm-node-arb:8546 + SOURCE_CHAIN_ID: 1337 + TARGET_CHAIN_ID: 1337 + TARGET_CHAIN_INDEX: 1 + AVS_REGISTRY_COORDINATOR_ADDR: 0x851356ae760d987E095750cCeb3bC6014560891C + GASP_SERVICE_ADDR: 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 + TESTNET: "true" + PUSH_FIRST_INIT: "true" + +## Secret environment variables +envSecrets: + ECDSA_KEY_JSON: '{"address":"a0ee7a142d267c1f36714e4a8f75612f20a79720","crypto":{"cipher":"aes-128-ctr","ciphertext":"b0f6f8e3ba33f0b382b080de6661d827181de480f1a4f94bc20d66cb3d585907","cipherparams":{"iv":"4e3f9a8ca6ef8d1cd408e8aaae3c22d2"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"c8f9f8cc03913e09cee7e1fd68732fac327576203ab277d740270f1dea82ee7e"},"mac":"353d65850b20d5fdb90ca2385c52e5b57662cb1d906fd58143f20a7720723cf6"},"id":"d3036cc7-d068-4f2f-9667-60aaca660e61","version":3}' + ROOT_ECDSA_KEY_JSON: '{"address":"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"26e1ebd941909ddb0ebaec8235470c8d"},"ciphertext":"adca2a84713f50c3918235e109a9b4b28ff6c8ea77b87e8aca20dc48a3a93389","kdf":"scrypt","kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"b5581b95b5c7f1449cc341db8567d4c92e4fe21bc34052dbe60bd3e2060a74a0"},"mac":"3643a9e1c0381e30ca0e250999810ecb4b213bc93bd19ad673b93870c77f55ec"},"id":"d39afde8-e06c-46d4-a7ed-1af9bb3f55a5","version":3}' nameOverride: "" image: - repository: mangatasolutions/rollup-updater + repository: mangatasolutions/gasp-syncer pullPolicy: Always ## Overrides the image tag whose default is the chart appVersion. tag: latest diff --git a/ops/helmfiles/config/default.yaml b/ops/helmfiles/config/default.yaml index 0cb5e381..e72a71ab 100644 --- a/ops/helmfiles/config/default.yaml +++ b/ops/helmfiles/config/default.yaml @@ -130,29 +130,24 @@ finalizerEnv: BLS_EPHEMERAL_KEY: "true" ########################### -# rollup-updater configs # +# gasp-syncer configs # ########################### -updaterEnabled: true - -updaterChainUrlEth: ws://evm-node-eth:8546 -updaterMnemonicEth: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" -updaterEnvEth: - CHAIN: "reth" - L1_CHAIN: "Ethereum" - MANGATA_NODE_URL: ws://collator-01:9944 - EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - MANGATA_CONTRACT_ADDRESS: "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650" - FINALIZATION_SOURCE: "relay" - -updaterChainUrlArb: ws://evm-node-arb:8546 -updaterMnemonicArb: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" -updaterEnvArb: - CHAIN: "reth" - L1_CHAIN: "Arbitrum" - MANGATA_NODE_URL: ws://collator-01:9944 - EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - MANGATA_CONTRACT_ADDRESS: "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9" - FINALIZATION_SOURCE: "relay" +gaspSyncerEnabled: true +gaspSyncerEnvSecrets: + ECDSA_KEY_JSON: '{"address":"a0ee7a142d267c1f36714e4a8f75612f20a79720","crypto":{"cipher":"aes-128-ctr","ciphertext":"b0f6f8e3ba33f0b382b080de6661d827181de480f1a4f94bc20d66cb3d585907","cipherparams":{"iv":"4e3f9a8ca6ef8d1cd408e8aaae3c22d2"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"c8f9f8cc03913e09cee7e1fd68732fac327576203ab277d740270f1dea82ee7e"},"mac":"353d65850b20d5fdb90ca2385c52e5b57662cb1d906fd58143f20a7720723cf6"},"id":"d3036cc7-d068-4f2f-9667-60aaca660e61","version":3}' + ROOT_ECDSA_KEY_JSON: '{"address":"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"26e1ebd941909ddb0ebaec8235470c8d"},"ciphertext":"adca2a84713f50c3918235e109a9b4b28ff6c8ea77b87e8aca20dc48a3a93389","kdf":"scrypt","kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"b5581b95b5c7f1449cc341db8567d4c92e4fe21bc34052dbe60bd3e2060a74a0"},"mac":"3643a9e1c0381e30ca0e250999810ecb4b213bc93bd19ad673b93870c77f55ec"},"id":"d39afde8-e06c-46d4-a7ed-1af9bb3f55a5","version":3}' +gaspSyncerEnv: + SOURCE_RPC_URL: http://evm-node-eth:8545 + SOURCE_WS_URL: ws://evm-node-eth:8546 + TARGET_RPC_URL: http://evm-node-arb:8545 + TARGET_WS_URL: ws://evm-node-arb:8546 + SOURCE_CHAIN_ID: 1337 + TARGET_CHAIN_ID: 1337 + TARGET_CHAIN_INDEX: 1 + AVS_REGISTRY_COORDINATOR_ADDR: 0x851356ae760d987E095750cCeb3bC6014560891C + GASP_SERVICE_ADDR: 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 + TESTNET: "true" + PUSH_FIRST_INIT: "true" ############################ diff --git a/ops/helmfiles/config/dev.yaml b/ops/helmfiles/config/dev.yaml index 6c5c9788..75239a64 100644 --- a/ops/helmfiles/config/dev.yaml +++ b/ops/helmfiles/config/dev.yaml @@ -143,29 +143,24 @@ finalizerEnv: BLS_EPHEMERAL_KEY: "true" ########################### -# rollup-updater configs # +# gasp-syncer configs # ########################### -updaterEnabled: true - -updaterChainUrlEth: ws://evm-node-eth:8546 -updaterMnemonicEth: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" -updaterEnvEth: - CHAIN: "reth" - L1_CHAIN: "Ethereum" - MANGATA_NODE_URL: ws://collator-01:9944 - EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - MANGATA_CONTRACT_ADDRESS: "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650" - FINALIZATION_SOURCE: "relay" - -updaterChainUrlArb: ws://evm-node-arb:8546 -updaterMnemonicArb: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" -updaterEnvArb: - CHAIN: "reth" - L1_CHAIN: "Arbitrum" - MANGATA_NODE_URL: ws://collator-01:9944 - EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - MANGATA_CONTRACT_ADDRESS: "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9" - FINALIZATION_SOURCE: "relay" +gaspSyncerEnabled: true +gaspSyncerEnvSecrets: + ECDSA_KEY_JSON: '{"address":"a0ee7a142d267c1f36714e4a8f75612f20a79720","crypto":{"cipher":"aes-128-ctr","ciphertext":"b0f6f8e3ba33f0b382b080de6661d827181de480f1a4f94bc20d66cb3d585907","cipherparams":{"iv":"4e3f9a8ca6ef8d1cd408e8aaae3c22d2"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"c8f9f8cc03913e09cee7e1fd68732fac327576203ab277d740270f1dea82ee7e"},"mac":"353d65850b20d5fdb90ca2385c52e5b57662cb1d906fd58143f20a7720723cf6"},"id":"d3036cc7-d068-4f2f-9667-60aaca660e61","version":3}' + ROOT_ECDSA_KEY_JSON: '{"address":"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"26e1ebd941909ddb0ebaec8235470c8d"},"ciphertext":"adca2a84713f50c3918235e109a9b4b28ff6c8ea77b87e8aca20dc48a3a93389","kdf":"scrypt","kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"b5581b95b5c7f1449cc341db8567d4c92e4fe21bc34052dbe60bd3e2060a74a0"},"mac":"3643a9e1c0381e30ca0e250999810ecb4b213bc93bd19ad673b93870c77f55ec"},"id":"d39afde8-e06c-46d4-a7ed-1af9bb3f55a5","version":3}' +gaspSyncerEnv: + SOURCE_RPC_URL: http://evm-node-eth:8545 + SOURCE_WS_URL: ws://evm-node-eth:8546 + TARGET_RPC_URL: http://evm-node-arb:8545 + TARGET_WS_URL: ws://evm-node-arb:8546 + SOURCE_CHAIN_ID: 1337 + TARGET_CHAIN_ID: 1337 + TARGET_CHAIN_INDEX: 1 + AVS_REGISTRY_COORDINATOR_ADDR: 0x851356ae760d987E095750cCeb3bC6014560891C + GASP_SERVICE_ADDR: 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 + TESTNET: "true" + PUSH_FIRST_INIT: "true" ############################ diff --git a/ops/helmfiles/config/frontend.yaml b/ops/helmfiles/config/frontend.yaml index ac6346d7..2163220f 100644 --- a/ops/helmfiles/config/frontend.yaml +++ b/ops/helmfiles/config/frontend.yaml @@ -150,29 +150,24 @@ finalizerEnv: BLS_EPHEMERAL_KEY: "true" ########################### -# rollup-updater configs # +# gasp-syncer configs # ########################### -updaterEnabled: true - -updaterChainUrlEth: ws://evm-node-eth:8546 -updaterMnemonicEth: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" -updaterEnvEth: - CHAIN: "reth-1337" - L1_CHAIN: "Ethereum" - MANGATA_NODE_URL: ws://collator-01:9944 - EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - MANGATA_CONTRACT_ADDRESS: "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650" - FINALIZATION_SOURCE: "relay" - -updaterChainUrlArb: ws://evm-node-arb:8546 -updaterMnemonicArb: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" -updaterEnvArb: - CHAIN: "reth-31337" - L1_CHAIN: "Arbitrum" - MANGATA_NODE_URL: ws://collator-01:9944 - EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - MANGATA_CONTRACT_ADDRESS: "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9" - FINALIZATION_SOURCE: "relay" +gaspSyncerEnabled: true +gaspSyncerEnvSecrets: + ECDSA_KEY_JSON: '{"address":"a0ee7a142d267c1f36714e4a8f75612f20a79720","crypto":{"cipher":"aes-128-ctr","ciphertext":"b0f6f8e3ba33f0b382b080de6661d827181de480f1a4f94bc20d66cb3d585907","cipherparams":{"iv":"4e3f9a8ca6ef8d1cd408e8aaae3c22d2"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"c8f9f8cc03913e09cee7e1fd68732fac327576203ab277d740270f1dea82ee7e"},"mac":"353d65850b20d5fdb90ca2385c52e5b57662cb1d906fd58143f20a7720723cf6"},"id":"d3036cc7-d068-4f2f-9667-60aaca660e61","version":3}' + ROOT_ECDSA_KEY_JSON: '{"address":"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"26e1ebd941909ddb0ebaec8235470c8d"},"ciphertext":"adca2a84713f50c3918235e109a9b4b28ff6c8ea77b87e8aca20dc48a3a93389","kdf":"scrypt","kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"b5581b95b5c7f1449cc341db8567d4c92e4fe21bc34052dbe60bd3e2060a74a0"},"mac":"3643a9e1c0381e30ca0e250999810ecb4b213bc93bd19ad673b93870c77f55ec"},"id":"d39afde8-e06c-46d4-a7ed-1af9bb3f55a5","version":3}' +gaspSyncerEnv: + SOURCE_RPC_URL: http://evm-node-eth:8545 + SOURCE_WS_URL: ws://evm-node-eth:8546 + TARGET_RPC_URL: http://evm-node-arb:8545 + TARGET_WS_URL: ws://evm-node-arb:8546 + SOURCE_CHAIN_ID: 1337 + TARGET_CHAIN_ID: 1337 + TARGET_CHAIN_INDEX: 1 + AVS_REGISTRY_COORDINATOR_ADDR: 0x851356ae760d987E095750cCeb3bC6014560891C + GASP_SERVICE_ADDR: 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 + TESTNET: "true" + PUSH_FIRST_INIT: "true" ############################ # rollup-sequencer configs # diff --git a/ops/helmfiles/config/fungible.yaml b/ops/helmfiles/config/fungible.yaml index cf2c2dbb..e2dbff3e 100644 --- a/ops/helmfiles/config/fungible.yaml +++ b/ops/helmfiles/config/fungible.yaml @@ -27,20 +27,19 @@ collator: enabled: false collator01: # Identity ID: 12D3KooWAfm5cK7DuUa2zh9SrSoHr2fsXXYbLALWXs5ob9mTDKHJ - customNodeKey: '5ad94653edf592f59d1b54960cda1334596cc3dcab8dd96adb334d3e22e912ef' + customNodeKey: "5ad94653edf592f59d1b54960cda1334596cc3dcab8dd96adb334d3e22e912ef" bootnodeAddr: /dns/collator-02-p2p/tcp/30333/p2p/12D3KooWFz4zM26EKYTpX98GhLhS3KLv7mUyvpYXCdzxdrorSVCu extraArgs: - --alith - --pruning=archive collator02: # Identity ID: 12D3KooWFz4zM26EKYTpX98GhLhS3KLv7mUyvpYXCdzxdrorSVCu - customNodeKey: 'bcaf1bb787b48156aadaf318603e5b37e637883edafb850912e364e913e2c35b' + customNodeKey: "bcaf1bb787b48156aadaf318603e5b37e637883edafb850912e364e913e2c35b" bootnodeAddr: /dns/collator-01-p2p/tcp/30333/p2p/12D3KooWAfm5cK7DuUa2zh9SrSoHr2fsXXYbLALWXs5ob9mTDKHJ extraArgs: - --baltathar - --pruning=archive - #################### # evm-node configs # #################### @@ -130,30 +129,24 @@ finalizerEnv: BLS_EPHEMERAL_KEY: "true" ########################### -# rollup-updater configs # +# gasp-syncer configs # ########################### -updaterEnabled: true - -updaterChainUrlEth: ws://evm-node-eth:8546 -updaterMnemonicEth: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" -updaterEnvEth: - CHAIN: "reth" - L1_CHAIN: "Ethereum" - MANGATA_NODE_URL: ws://collator-01:9944 - EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - MANGATA_CONTRACT_ADDRESS: "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650" - FINALIZATION_SOURCE: "relay" - -updaterChainUrlArb: ws://evm-node-arb:8546 -updaterMnemonicArb: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" -updaterEnvArb: - CHAIN: "reth" - L1_CHAIN: "Arbitrum" - MANGATA_NODE_URL: ws://collator-01:9944 - EIGEN_CONTRACT_ADDRESS: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - MANGATA_CONTRACT_ADDRESS: "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9" - FINALIZATION_SOURCE: "relay" - +gaspSyncerEnabled: true +gaspSyncerEnvSecrets: + ECDSA_KEY_JSON: '{"address":"a0ee7a142d267c1f36714e4a8f75612f20a79720","crypto":{"cipher":"aes-128-ctr","ciphertext":"b0f6f8e3ba33f0b382b080de6661d827181de480f1a4f94bc20d66cb3d585907","cipherparams":{"iv":"4e3f9a8ca6ef8d1cd408e8aaae3c22d2"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"c8f9f8cc03913e09cee7e1fd68732fac327576203ab277d740270f1dea82ee7e"},"mac":"353d65850b20d5fdb90ca2385c52e5b57662cb1d906fd58143f20a7720723cf6"},"id":"d3036cc7-d068-4f2f-9667-60aaca660e61","version":3}' + ROOT_ECDSA_KEY_JSON: '{"address":"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"26e1ebd941909ddb0ebaec8235470c8d"},"ciphertext":"adca2a84713f50c3918235e109a9b4b28ff6c8ea77b87e8aca20dc48a3a93389","kdf":"scrypt","kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"b5581b95b5c7f1449cc341db8567d4c92e4fe21bc34052dbe60bd3e2060a74a0"},"mac":"3643a9e1c0381e30ca0e250999810ecb4b213bc93bd19ad673b93870c77f55ec"},"id":"d39afde8-e06c-46d4-a7ed-1af9bb3f55a5","version":3}' +gaspSyncerEnv: + SOURCE_RPC_URL: http://evm-node-eth:8545 + SOURCE_WS_URL: ws://evm-node-eth:8546 + TARGET_RPC_URL: http://evm-node-arb:8545 + TARGET_WS_URL: ws://evm-node-arb:8546 + SOURCE_CHAIN_ID: 1337 + TARGET_CHAIN_ID: 1337 + TARGET_CHAIN_INDEX: 1 + AVS_REGISTRY_COORDINATOR_ADDR: 0x851356ae760d987E095750cCeb3bC6014560891C + GASP_SERVICE_ADDR: 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 + TESTNET: "true" + PUSH_FIRST_INIT: "true" ############################ # rollup-sequencer configs # @@ -161,7 +154,6 @@ updaterEnvArb: sequencerEnabled: true secondSequencerEnabled: false - firstSequencerMnemonicEth: "0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b" secondSequencerMnemonicEth: "bottom drive obey lake curtain smoke basket hold race lonely fit walk//Bob" sequencerChainUrlEth: ws://evm-node-eth:8546 diff --git a/ops/helmfiles/config/holesky.yaml b/ops/helmfiles/config/holesky.yaml index 79981ecf..dd97a953 100644 --- a/ops/helmfiles/config/holesky.yaml +++ b/ops/helmfiles/config/holesky.yaml @@ -156,33 +156,24 @@ finalizerEnv: RUST_LOG: avs=debug,ether=trace ########################### -# rollup-updater configs # +# gasp-syncer configs # ########################### -updaterEnabled: true -# Override the image tag provided on deployment from IMAGE_TAG env variable -updaterImageTag: 028fcb899a6e4be1be008b0f063f2a9d15bfe07b - -updaterChainUrlEth: ref+sops://secrets.enc.yaml#/holeskyEthereumHttpsUrl -updaterMnemonicEth: ref+sops://secrets.enc.yaml#/updaterMnemonicEth -updaterEnvEth: - CHAIN: "holesky" - L1_CHAIN: "Ethereum" - MANGATA_NODE_URL: ws://rpc-shared-dns-record:9944 - EIGEN_CONTRACT_ADDRESS: "0x0000000000000000000000000000000000000000" - MANGATA_CONTRACT_ADDRESS: "0x93de6a193A839218BCA00c8D478256Ac78281cE3" - FINALIZATION_SOURCE: "relay" - LIMIT: "25" - -updaterChainUrlArb: ref+sops://secrets.enc.yaml#/sepoliaArbitrumHttpsUrl -updaterMnemonicArb: ref+sops://secrets.enc.yaml#/updaterMnemonicArb -updaterEnvArb: - CHAIN: "arbitrum" - L1_CHAIN: "Arbitrum" - MANGATA_NODE_URL: ws://rpc-shared-dns-record:9944 - EIGEN_CONTRACT_ADDRESS: "0x0000000000000000000000000000000000000000" - MANGATA_CONTRACT_ADDRESS: "0x998AaF69F731009d4E2d470E974766F1EB8f5142" - FINALIZATION_SOURCE: "relay" - LIMIT: "25" +gaspSyncerEnabled: true +gaspSyncerEnvSecrets: + ECDSA_KEY_JSON: '{"address":"a0ee7a142d267c1f36714e4a8f75612f20a79720","crypto":{"cipher":"aes-128-ctr","ciphertext":"b0f6f8e3ba33f0b382b080de6661d827181de480f1a4f94bc20d66cb3d585907","cipherparams":{"iv":"4e3f9a8ca6ef8d1cd408e8aaae3c22d2"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"c8f9f8cc03913e09cee7e1fd68732fac327576203ab277d740270f1dea82ee7e"},"mac":"353d65850b20d5fdb90ca2385c52e5b57662cb1d906fd58143f20a7720723cf6"},"id":"d3036cc7-d068-4f2f-9667-60aaca660e61","version":3}' + ROOT_ECDSA_KEY_JSON: '{"address":"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266","crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"26e1ebd941909ddb0ebaec8235470c8d"},"ciphertext":"adca2a84713f50c3918235e109a9b4b28ff6c8ea77b87e8aca20dc48a3a93389","kdf":"scrypt","kdfparams":{"dklen":32,"n":8192,"p":1,"r":8,"salt":"b5581b95b5c7f1449cc341db8567d4c92e4fe21bc34052dbe60bd3e2060a74a0"},"mac":"3643a9e1c0381e30ca0e250999810ecb4b213bc93bd19ad673b93870c77f55ec"},"id":"d39afde8-e06c-46d4-a7ed-1af9bb3f55a5","version":3}' + SOURCE_RPC_URL: ref+sops://secrets.enc.yaml#/holeskyEthereumHttpsUrl + SOURCE_WS_URL: ref+sops://secrets.enc.yaml#/holeskyEthereumWssUrl + TARGET_RPC_URL: ref+sops://secrets.enc.yaml#/sepoliaArbitrumHttpsUrl + TARGET_WS_URL: ref+sops://secrets.enc.yaml#/sepoliaArbitrumWssUrl +gaspSyncerEnv: + SOURCE_CHAIN_ID: 17000 + TARGET_CHAIN_ID: 421614 + TARGET_CHAIN_INDEX: 1 + AVS_REGISTRY_COORDINATOR_ADDR: 0x851356ae760d987E095750cCeb3bC6014560891C + GASP_SERVICE_ADDR: 0x610178dA211FEF7D417bC0e6FeD39F05609AD788 + TESTNET: "true" + PUSH_FIRST_INIT: "true" ############################ # rollup-sequencer configs # diff --git a/ops/helmfiles/helmfile.yaml b/ops/helmfiles/helmfile.yaml index bdb4f328..7f288d26 100644 --- a/ops/helmfiles/helmfile.yaml +++ b/ops/helmfiles/helmfile.yaml @@ -105,31 +105,17 @@ releases: envSecrets: {{ .Values.finalizerEnvSecrets | expandSecretRefs | toYaml | nindent 10 }} env: {{ .Values.finalizerEnv | toYaml | nindent 10 }} - - name: rollup-updater-eth + - name: gasp-syncer namespace: 'rollup-{{ .Values.environmentName }}' - installed: {{ .Values.updaterEnabled }} - chart: ../helm-charts/rollup-updater + installed: {{ .Values.gaspSyncerEnabled }} + chart: ../helm-charts/gasp-syncer values: - image: - repository: mangatasolutions/rollup-updater - tag: {{ .Values | get "updaterImageTag" (requiredEnv "IMAGE_TAG") | quote }} + repository: mangatasolutions/gasp-syncer + tag: {{ .Values | get gaspSyncerImageTag" (requiredEnv "IMAGE_TAG") | quote }} environment: {{ .Values.environmentName }} - walletPrivateKey: {{ .Values.updaterMnemonicEth | fetchSecretValue | quote }} - ethChainUrl: {{ .Values.updaterChainUrlEth | fetchSecretValue | quote }} - env: {{ .Values.updaterEnvEth | toYaml | nindent 10 }} - - - name: rollup-updater-arb - namespace: 'rollup-{{ .Values.environmentName }}' - installed: {{ and .Values.updaterEnabled .Values.enableArbitrumServices }} - chart: ../helm-charts/rollup-updater - values: - - image: - repository: mangatasolutions/rollup-updater - tag: {{ .Values | get "updaterImageTag" (requiredEnv "IMAGE_TAG") | quote }} - environment: {{ .Values.environmentName }} - walletPrivateKey: {{ .Values.updaterMnemonicArb | fetchSecretValue | quote }} - ethChainUrl: {{ .Values.updaterChainUrlArb | fetchSecretValue | quote }} - env: {{ .Values.updaterEnvArb | toYaml | nindent 10 }} + env: {{ .Values.gaspSyncerEnv | toYaml | nindent 10 }} + envSecrets: {{ .Values.gaspSyncerEnvSecrets | expandSecretRefs | toYaml | nindent 10 }} - name: rollup-sequencer-eth namespace: 'rollup-{{ .Values.environmentName }}' diff --git a/ops/helmfiles/secrets.enc.yaml b/ops/helmfiles/secrets.enc.yaml index fabb3502..4bfca8fb 100644 --- a/ops/helmfiles/secrets.enc.yaml +++ b/ops/helmfiles/secrets.enc.yaml @@ -3,6 +3,7 @@ updaterMnemonicArb: ENC[AES256_GCM,data:OlgNCI5ZNrqCogAAqrF6mFRQc3VwMcoMmE0Lg6uZ holeskyEthereumHttpsUrl: ENC[AES256_GCM,data:V4/t6YXG3K4CJXGtsNbCN4PExsGBJqPDHI/4NxdTDUJNjY7z1ZcaftS5xUeBF0winLyytr8eV3sp,iv:OCSRw8VZ3/B4rYqVLOyRpcCO0FmeCTgEiFfHyMpfqgs=,tag:Uomk+fNdThyQ8V4xkhX/HQ==,type:str] holeskyEthereumWssUrl: ENC[AES256_GCM,data:Cbk8S+p9vaKdktWMOXRXNAoutSBO40IA6EGQp+Ju3JAl6f3vkxVTKocT4vIg3SPNAJQW+lEVzA==,iv:RUXo+QfDCX7ZjUc4Q2NXlVk1Hi4pZqw31a/FwTm3ouE=,tag:UbxJYM98b7kAKaawlaiNbA==,type:str] sepoliaArbitrumHttpsUrl: ENC[AES256_GCM,data:YJDtz1iLAQ8xMHUFdiQRtu4Ztg7M3Mw+Qjd53zab+YSfuqhKqHdEu2nZ3FTfzaEvIQRu/F9ZrvqfZm1H8F5bO4e5,iv:CvpzWo0cw1/9LvqgkdmFYquOnbfAmccrv+FVcrNW5PU=,tag:DITUDuRRJ/iAeHjl5lTMjg==,type:str] +sepoliaArbitrumWssUrl: ENC[AES256_GCM,data:NoJwu5Dx2VJKtFjb+4pLfCd3CMlOtRmCUA/Oir0XWd9nqb+XXzWk3zD7HfAUGkGNhlp0BbAzxjvcduHdf6URqA==,iv:jEVKygvHuxZhKCW6zbTaP0BimKqisuSACgRC/ThWysU=,tag:vA7rfnb3ZdWwG6oI1PjDgA==,type:str] testnetAggregatorEcdsaKeyJson: ENC[AES256_GCM,data:ZUHnG8IBuucAb+yuFV9TMYkCvitiwh1qNHta6cM8R23KJnnCJcDc7GCScNYxGiiH1WWHmDdU1SQB5IOPyOIS6l0R+iFyozbfOI6q7AkNWqqqc01tFNf5olsdLLaYl3fG8edkBlLT1ftLKCa3tRkiFwiVBkEjAFTUbRn78B4Gfb4oF/Zajm48UhEomZWp5lzVxxpeFm2MDnbXTGbTw6D9LCnReM1ngBa3cBTU4+x4MinaoAVKZPg1rlvc5ZX2JYLSVPaf+w6X+pnQ2a99h9IxvpwMTdwPBgh87zMrvL+MvDPK8UNqJD/DTaZCXJW4YsreotIh2GKySwlYTkSJ96ztqSuHxXRXn8E6/yKgXkEW8GKDgp66tLUOa+7LU+bgP/AnxXfPoi9DzU10+3dgRhMejs7BIwh4keaJuuoLQVsI5junDv0MV9AZBQeTJ49p+8iF/j1bfg66/fVpqBZtIhBJKH2pZ77RGksU69AuCLaac26ORl9TuNEUVZiD9GlHKRoDUc1jLFmFnhghiec0ZNoT2kfwtz+jNlkFX5R2x0eBDBnhW25wbsKB9p9A15ZQxQpiAXpydc1fEJTmcGqrPvLaEP4IbwaLS2G8M2jd8hHEIBJHvSSTKuLGs08v4TEBAKabs0X15gtUOFO+pH4=,iv:IkSoPQafCdZWhFrmmdBU/EHtslxPsvHM9MdcsiF+J+k=,tag:ETiyavbYTWyYsnTcnd4pnA==,type:str] testnetAggregatorEcdsaKeyPassword: ENC[AES256_GCM,data:jNP+olwSZ3fHPdByjoRqATD3vuZOFhVi,iv:qM88FsNZPAZK19Fwpa6k1lAEhe+qwOklN1biyL9VQEw=,tag:pjFsWFijGgaxMyOiVuQbbw==,type:str] testnetFinalizerEcdsaKeyJson: ENC[AES256_GCM,data:oBipFecOGxbBtyC49KeRiJtyoSnBW+jqBZsf2VFuos9y95/OuIY54kOMZxbNJdd7aeR2QZCiC2dlZzcK/bxSGNZq7HJ5n1AB82qFT91zOBa829qUsXWSwdqUocPl1c4d0KB/ylmfX0lQZiW88kuVefNaXSSxPNz0kG5hDwOxDHSudlqDwqU0VDMEH1XNKYU50Tcx/roxbVZYCvDE2ZTS1QDK3iN4jG0Ey8v5akgk9R9zDZqyJDqL7Z6l8FXcbIsp6Y4vwYV6T4en82oHoJsSZs7FRWNxbwbhXu/nFu6yv2UHrUD8LEgM7KYVd87hhFK4di3E4jHXnH0bJ5HtXr3Jm/7zLKhBnmMY4R2LcUjTqKshTYg6qGKl4XnJezsHXgZrH9IrsycG2UQdTGFbPbEAl6l0GeuBgb+f9um+WLggl/hylwzRxb6V4aR2GXJQp90J9UGMqZheBcAOOrHsJmuOtVcRDjEmIDSt2HibpSAmpEBSA22T3kj+js4qoXl7tU5QiZA+b2sr8Q8s5ALby5E/GQDSES7/I3/Hr1asMH4Ee8MxBwmsEs9Z44qg897nIg+MZDYzE1xcDttUY7d0BOhOFYA+wFZbPviO6oGCVALjt3STIdjWYKyg388ZzkdcBecvoV+K+wXZuN6NfFY=,iv:NVHxOSxJQ/jS7CmhGdWaBhAm/rj4M5wNn5KcQ3FeZ7k=,tag:sILjTfS24LJTzXjl1MKE1w==,type:str] @@ -21,8 +22,8 @@ sops: azure_kv: [] hc_vault: [] age: [] - lastmodified: "2024-08-13T06:13:18Z" - mac: ENC[AES256_GCM,data:dyKiW/qeDHKXloSCXlhbx03xkX2VTu3+tgzsPdCr4D3gYLuhs0t46xNJ3SAu9+5ya7O7xgXaI18ewsN/4Evd1fNN5WZMEkHQGiEk305dQwPfuX5yVCDQkIugv94nxnQH0JMscjC0r07nNIHzmpaZBNfF8qFulrvrwx8IwQgdRhk=,iv:n98bcyDEsJhn+rP0WUnEsMNYcRjw3vnoPUBXPR13qOQ=,tag:xaqCL2yl6gP/wcSpaRHeNw==,type:str] + lastmodified: "2024-10-02T15:54:49Z" + mac: ENC[AES256_GCM,data:3GxEFXXhUhP8gzbss1lGkCRC49tnJNzIQgYcmsAAoNdPmBas3LYODXM6VTvaMeQia5TTdBK26cCXlnuJ/Q4R5rH4dfCGuxwQA2sn0hAJt9PyWgAee/f2OOBPwc7Pke99iBiVpK0vTiVd9uhYETW1gbuYDQ8kE8EQUlnAGhTlDBw=,iv:/ABQ0duvyw1JekoTChNI+E6sviSPR5PcAXxQH10BrW8=,tag:SyAZD1hBt2s6pGOtFMk1tg==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.8.1 + version: 3.9.0 From 5ae1c7fdada9e2d37bf95b8020139f50c9739113 Mon Sep 17 00:00:00 2001 From: tenequm Date: Wed, 2 Oct 2024 17:21:08 +0100 Subject: [PATCH 3/6] fix: Helmfile and Helm chart format issues --- ops/helm-charts/gasp-syncer/templates/secret.yaml | 2 +- ops/helmfiles/helmfile.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ops/helm-charts/gasp-syncer/templates/secret.yaml b/ops/helm-charts/gasp-syncer/templates/secret.yaml index 34209625..6bcab3eb 100644 --- a/ops/helm-charts/gasp-syncer/templates/secret.yaml +++ b/ops/helm-charts/gasp-syncer/templates/secret.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: "{{ include "node.name" . }}-secret" + name: "{{ include "app.name" . }}-secret" data: {{- range $key, $val := .Values.envSecrets }} {{ $key }}: {{ $val | b64enc | quote }} diff --git a/ops/helmfiles/helmfile.yaml b/ops/helmfiles/helmfile.yaml index 7f288d26..f9b30095 100644 --- a/ops/helmfiles/helmfile.yaml +++ b/ops/helmfiles/helmfile.yaml @@ -112,7 +112,7 @@ releases: values: - image: repository: mangatasolutions/gasp-syncer - tag: {{ .Values | get gaspSyncerImageTag" (requiredEnv "IMAGE_TAG") | quote }} + tag: {{ .Values | get "gaspSyncerImageTag" (requiredEnv "IMAGE_TAG") | quote }} environment: {{ .Values.environmentName }} env: {{ .Values.gaspSyncerEnv | toYaml | nindent 10 }} envSecrets: {{ .Values.gaspSyncerEnvSecrets | expandSecretRefs | toYaml | nindent 10 }} From fe73ced5978d03fc5a42a269c3c31d5723ca53b6 Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Wed, 18 Sep 2024 14:26:22 +0200 Subject: [PATCH 4/6] provide missing parameter required by arbitrum deployment --- contracts/script/config/1337/deploy.config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/contracts/script/config/1337/deploy.config.json b/contracts/script/config/1337/deploy.config.json index a08ff222..09b24b07 100644 --- a/contracts/script/config/1337/deploy.config.json +++ b/contracts/script/config/1337/deploy.config.json @@ -6,6 +6,7 @@ "owner": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266", "upgrader": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266", "rolldownUpdater": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266", + "gmrsUpdater": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720", "churner": "0x0000000000000000000000000000000000000000", "ejector": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720", "aggregator": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720", From afd460846ff13e2ce1ec27af5476b068e805d32e Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Wed, 18 Sep 2024 14:28:10 +0200 Subject: [PATCH 5/6] update deployment configs --- .../input/1337/arbitrum_rolldown_output.json | 18 ------ .../input/1337/ethereum_rolldown_output.json | 63 ------------------- .../output/1337/ethereum_rolldown_output.json | 12 ++-- 3 files changed, 6 insertions(+), 87 deletions(-) delete mode 100644 contracts/script/input/1337/arbitrum_rolldown_output.json delete mode 100644 contracts/script/input/1337/ethereum_rolldown_output.json diff --git a/contracts/script/input/1337/arbitrum_rolldown_output.json b/contracts/script/input/1337/arbitrum_rolldown_output.json deleted file mode 100644 index ab98f269..00000000 --- a/contracts/script/input/1337/arbitrum_rolldown_output.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "addresses": { - "gaspErc20Mock": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0", - "rolldown": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9", - "rolldownImplementation": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707", - "rolldownPauseReg": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512", - "rolldownProxyAdmin": "0x5FbDB2315678afecb367f032d93F642f64180aa3" - }, - "chainInfo": { - "chainId": 1337, - "deploymentBlock": 0 - }, - "permissions": { - "rolldownOwner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "rolldownUpdater": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "rolldownUpgrader": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" - } -} \ No newline at end of file diff --git a/contracts/script/input/1337/ethereum_rolldown_output.json b/contracts/script/input/1337/ethereum_rolldown_output.json deleted file mode 100644 index 945ae1cc..00000000 --- a/contracts/script/input/1337/ethereum_rolldown_output.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "addresses": { - "avsDirectory": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707", - "avsDirectoryImplementation": "0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82", - "avsPauseReg": "0x84eA74d481Ee0A5332c457a4d796187F6Ba67fEB", - "avsProxyAdmin": "0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690", - "baseStrategyImplementation": "0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44", - "blsApkRegistry": "0xf5059a5D33d5853360D16C683c16e67980206f36", - "blsApkRegistryImplementation": "0x99bbA657f2BbC93c02D617f8bA121cB8Fc104Acf", - "delayedWithdrawalRouter": "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6", - "delayedWithdrawalRouterImplementation": "0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1", - "delegationImplementation": "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e", - "delegationManager": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9", - "eigenLayerPauserReg": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512", - "eigenLayerProxyAdmin": "0x5FbDB2315678afecb367f032d93F642f64180aa3", - "eigenPodBeacon": "0x610178dA211FEF7D417bC0e6FeD39F05609AD788", - "eigenPodImplementation": "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318", - "eigenPodManager": "0xa513E6E4b8f2a923D98304ec87F64353C4D5C853", - "eigenPodManagerImplementation": "0x0B306BF915C4d645ff596e518fAf3F9669b97016", - "emptyContract": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0", - "erc20Mock": "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F", - "erc20MockStrategy": "0x09635F643e140090A9A8Dcd712eD6285858ceBef", - "gaspErc20Mock": "0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3", - "indexRegistry": "0x95401dc811bb5740090279Ba06cfA8fcF6113778", - "indexRegistryImplementation": "0x8f86403A4DE0BB5791fa46B8e795C547942fE4Cf", - "registryCoordinator": "0x851356ae760d987E095750cCeb3bC6014560891C", - "registryCoordinatorImplementation": "0x5eb3Bc0a489C5A8288765d2336659EbCA68FCd00", - "rolldown": "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650", - "rolldownImplementation": "0xc351628EB244ec633d5f21fBD6621e1a683B1181", - "rolldownPauseReg": "0x82e01223d51Eb87e16A03E24687EDF0F294da6f1", - "rolldownProxyAdmin": "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90", - "serviceManager": "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9", - "serviceManagerImplementation": "0x809d550fca64d94Bd9F66E60752A544199cfAC3D", - "slasher": "0x0165878A594ca255338adfa4d48449f69242Eb8F", - "slasherImplementation": "0x9A676e781A523b5d0C0e43731313A708CB607508", - "stakeRegistry": "0x998abeb3E57409262aE5b751f60747921B33613E", - "stakeRegistryImplementation": "0x70e0bA845a1A0F2DA3359C97E0285013525FFC49", - "strategies": "", - "strategyManager": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9", - "strategyManagerImplementation": "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0", - "taksManagerImplementation": "0x1291Be112d480055DaFd8a610b7d1e203891C274", - "taskManager": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" - }, - "chainInfo": { - "chainId": 1337, - "deploymentBlock": 0 - }, - "parameters": { - "executorMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "operationsMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" - }, - "permissions": { - "aggregator": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720", - "avsChurner": "0x0000000000000000000000000000000000000000", - "avsEjector": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720", - "avsMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "avsOwner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "avsUpgrader": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "rolldownOwner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "rolldownUpdater": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "rolldownUpgrader": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" - } -} \ No newline at end of file diff --git a/contracts/script/output/1337/ethereum_rolldown_output.json b/contracts/script/output/1337/ethereum_rolldown_output.json index 945ae1cc..d017f7e9 100644 --- a/contracts/script/output/1337/ethereum_rolldown_output.json +++ b/contracts/script/output/1337/ethereum_rolldown_output.json @@ -20,15 +20,15 @@ "emptyContract": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0", "erc20Mock": "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F", "erc20MockStrategy": "0x09635F643e140090A9A8Dcd712eD6285858ceBef", - "gaspErc20Mock": "0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3", + "gaspErc20Mock": "0xc351628EB244ec633d5f21fBD6621e1a683B1181", "indexRegistry": "0x95401dc811bb5740090279Ba06cfA8fcF6113778", "indexRegistryImplementation": "0x8f86403A4DE0BB5791fa46B8e795C547942fE4Cf", "registryCoordinator": "0x851356ae760d987E095750cCeb3bC6014560891C", "registryCoordinatorImplementation": "0x5eb3Bc0a489C5A8288765d2336659EbCA68FCd00", - "rolldown": "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650", - "rolldownImplementation": "0xc351628EB244ec633d5f21fBD6621e1a683B1181", - "rolldownPauseReg": "0x82e01223d51Eb87e16A03E24687EDF0F294da6f1", - "rolldownProxyAdmin": "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90", + "rolldown": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc", + "rolldownImplementation": "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f", + "rolldownPauseReg": "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650", + "rolldownProxyAdmin": "0x7969c5eD335650692Bc04293B07F5BF2e7A673C0", "serviceManager": "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9", "serviceManagerImplementation": "0x809d550fca64d94Bd9F66E60752A544199cfAC3D", "slasher": "0x0165878A594ca255338adfa4d48449f69242Eb8F", @@ -38,7 +38,7 @@ "strategies": "", "strategyManager": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9", "strategyManagerImplementation": "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0", - "taksManagerImplementation": "0x1291Be112d480055DaFd8a610b7d1e203891C274", + "taksManagerImplementation": "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90", "taskManager": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" }, "chainInfo": { From 6f8bdb8eb8c64ad98f7f77d0134effa988a49f4c Mon Sep 17 00:00:00 2001 From: tenequm Date: Mon, 23 Sep 2024 16:39:17 +0100 Subject: [PATCH 6/6] fix: copypaste ethereum_rolldown_output.json and arbitrum_rolldown_output.json files into scripts/input/1337 from scripts/output/1337 to fix the issue with contracts redeployment --- .gitignore | 6 +- .../input/1337/arbitrum_rolldown_output.json | 18 ++++++ .../input/1337/ethereum_rolldown_output.json | 63 +++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 contracts/script/input/1337/arbitrum_rolldown_output.json create mode 100644 contracts/script/input/1337/ethereum_rolldown_output.json diff --git a/.gitignore b/.gitignore index fb8bea73..a4b33459 100644 --- a/.gitignore +++ b/.gitignore @@ -87,6 +87,9 @@ out **/broadcast/* **/broadcast/*/31337/ +!contracts/script/input/1337/ethereum_rolldown_output.json +!contracts/script/input/1337/arbitrum_rolldown_output.json + /ops/blockscout-docker-compose/services/blockscout-db-data /ops/blockscout-docker-compose/services/stats-db-data /ops/blockscout-docker-compose/services/redis-data @@ -95,4 +98,5 @@ out .continueignore -.decrypted* \ No newline at end of file +.decrypted* + diff --git a/contracts/script/input/1337/arbitrum_rolldown_output.json b/contracts/script/input/1337/arbitrum_rolldown_output.json new file mode 100644 index 00000000..ab98f269 --- /dev/null +++ b/contracts/script/input/1337/arbitrum_rolldown_output.json @@ -0,0 +1,18 @@ +{ + "addresses": { + "gaspErc20Mock": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0", + "rolldown": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9", + "rolldownImplementation": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707", + "rolldownPauseReg": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512", + "rolldownProxyAdmin": "0x5FbDB2315678afecb367f032d93F642f64180aa3" + }, + "chainInfo": { + "chainId": 1337, + "deploymentBlock": 0 + }, + "permissions": { + "rolldownOwner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", + "rolldownUpdater": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", + "rolldownUpgrader": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" + } +} \ No newline at end of file diff --git a/contracts/script/input/1337/ethereum_rolldown_output.json b/contracts/script/input/1337/ethereum_rolldown_output.json new file mode 100644 index 00000000..d017f7e9 --- /dev/null +++ b/contracts/script/input/1337/ethereum_rolldown_output.json @@ -0,0 +1,63 @@ +{ + "addresses": { + "avsDirectory": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707", + "avsDirectoryImplementation": "0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82", + "avsPauseReg": "0x84eA74d481Ee0A5332c457a4d796187F6Ba67fEB", + "avsProxyAdmin": "0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690", + "baseStrategyImplementation": "0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44", + "blsApkRegistry": "0xf5059a5D33d5853360D16C683c16e67980206f36", + "blsApkRegistryImplementation": "0x99bbA657f2BbC93c02D617f8bA121cB8Fc104Acf", + "delayedWithdrawalRouter": "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6", + "delayedWithdrawalRouterImplementation": "0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1", + "delegationImplementation": "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e", + "delegationManager": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9", + "eigenLayerPauserReg": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512", + "eigenLayerProxyAdmin": "0x5FbDB2315678afecb367f032d93F642f64180aa3", + "eigenPodBeacon": "0x610178dA211FEF7D417bC0e6FeD39F05609AD788", + "eigenPodImplementation": "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318", + "eigenPodManager": "0xa513E6E4b8f2a923D98304ec87F64353C4D5C853", + "eigenPodManagerImplementation": "0x0B306BF915C4d645ff596e518fAf3F9669b97016", + "emptyContract": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0", + "erc20Mock": "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F", + "erc20MockStrategy": "0x09635F643e140090A9A8Dcd712eD6285858ceBef", + "gaspErc20Mock": "0xc351628EB244ec633d5f21fBD6621e1a683B1181", + "indexRegistry": "0x95401dc811bb5740090279Ba06cfA8fcF6113778", + "indexRegistryImplementation": "0x8f86403A4DE0BB5791fa46B8e795C547942fE4Cf", + "registryCoordinator": "0x851356ae760d987E095750cCeb3bC6014560891C", + "registryCoordinatorImplementation": "0x5eb3Bc0a489C5A8288765d2336659EbCA68FCd00", + "rolldown": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc", + "rolldownImplementation": "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f", + "rolldownPauseReg": "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650", + "rolldownProxyAdmin": "0x7969c5eD335650692Bc04293B07F5BF2e7A673C0", + "serviceManager": "0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9", + "serviceManagerImplementation": "0x809d550fca64d94Bd9F66E60752A544199cfAC3D", + "slasher": "0x0165878A594ca255338adfa4d48449f69242Eb8F", + "slasherImplementation": "0x9A676e781A523b5d0C0e43731313A708CB607508", + "stakeRegistry": "0x998abeb3E57409262aE5b751f60747921B33613E", + "stakeRegistryImplementation": "0x70e0bA845a1A0F2DA3359C97E0285013525FFC49", + "strategies": "", + "strategyManager": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9", + "strategyManagerImplementation": "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0", + "taksManagerImplementation": "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90", + "taskManager": "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8" + }, + "chainInfo": { + "chainId": 1337, + "deploymentBlock": 0 + }, + "parameters": { + "executorMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", + "operationsMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" + }, + "permissions": { + "aggregator": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720", + "avsChurner": "0x0000000000000000000000000000000000000000", + "avsEjector": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720", + "avsMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", + "avsOwner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", + "avsUpgrader": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", + "rolldownOwner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", + "rolldownUpdater": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", + "rolldownUpgrader": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266" + } +} \ No newline at end of file