From 817c9c15976ea2e70792bc17404d7e7c53775e05 Mon Sep 17 00:00:00 2001 From: Bharath Date: Thu, 21 Nov 2024 15:10:54 +0530 Subject: [PATCH 01/10] update charts for auctioneer --- charts/evm-rollup/files/genesis/geth-genesis.json | 3 ++- charts/evm-rollup/values.yaml | 4 +++- dev/values/rollup/dev.yaml | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json index 68027198d0..667b63a649 100644 --- a/charts/evm-rollup/files/genesis/geth-genesis.json +++ b/charts/evm-rollup/files/genesis/geth-genesis.json @@ -38,7 +38,8 @@ "astriaBridgeAddresses": {{ toPrettyJson .Values.genesis.bridgeAddresses | indent 8 | trim }}, "astriaFeeCollectors": {{ toPrettyJson .Values.genesis.feeCollectors | indent 8 | trim }}, "astriaEIP1559Params": {{ toPrettyJson .Values.genesis.eip1559Params | indent 8 | trim }}, - "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}" + "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}", + "astriaTrustedBuilderAddresses": {{ toPrettyJson .Values.genesis.trustedBuilderAddresses | indent 8 | trim }} {{- if not .Values.global.dev }} {{- else }} {{- end }} diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 1f2472c022..1d3017c1f4 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -70,7 +70,8 @@ genesis: # minBaseFee: 0 # elasticityMultiplier: 2 # baseFeeChangeDenominator: 8 - + trustedBuilderAddresses: {} + # 1: "astria1ferdmm38w7zr4ankmntst0g0qg8e7ygeu3vxcy" ## Standard Eth Genesis config values # An EVM chain number id, different from the astria rollup name chainId: "" @@ -159,6 +160,7 @@ config: condition: .Values.metrics.enabled - name: txpool.nolocals value: "true" + - name: auctioneer conductor: diff --git a/dev/values/rollup/dev.yaml b/dev/values/rollup/dev.yaml index 0d9be85422..06367a68e1 100644 --- a/dev/values/rollup/dev.yaml +++ b/dev/values/rollup/dev.yaml @@ -57,6 +57,8 @@ evm-rollup: # minBaseFee: 0 # elasticityMultiplier: 2 # baseFeeChangeDenominator: 8 + trustedBuilderAddresses: + 1: "astria1ferdmm38w7zr4ankmntst0g0qg8e7ygeu3vxcy" ## Standard Eth Genesis config values # Configuration of Eth forks, setting to 0 will enable from height, From 6c67a91d05339168f2469f7e269d1c04f8b3e082 Mon Sep 17 00:00:00 2001 From: Bharath Date: Thu, 21 Nov 2024 15:39:17 +0530 Subject: [PATCH 02/10] use auctioneerAddresses instead of trusted builder addresses --- charts/evm-rollup/files/genesis/geth-genesis.json | 2 +- charts/evm-rollup/values.yaml | 2 +- dev/values/rollup/dev.yaml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json index 667b63a649..f67049c0c3 100644 --- a/charts/evm-rollup/files/genesis/geth-genesis.json +++ b/charts/evm-rollup/files/genesis/geth-genesis.json @@ -39,7 +39,7 @@ "astriaFeeCollectors": {{ toPrettyJson .Values.genesis.feeCollectors | indent 8 | trim }}, "astriaEIP1559Params": {{ toPrettyJson .Values.genesis.eip1559Params | indent 8 | trim }}, "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}", - "astriaTrustedBuilderAddresses": {{ toPrettyJson .Values.genesis.trustedBuilderAddresses | indent 8 | trim }} + "astriaAuctioneerAddresses": {{ toPrettyJson .Values.genesis.auctioneerAddresses | indent 8 | trim }} {{- if not .Values.global.dev }} {{- else }} {{- end }} diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 1d3017c1f4..76a0c5f671 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -70,7 +70,7 @@ genesis: # minBaseFee: 0 # elasticityMultiplier: 2 # baseFeeChangeDenominator: 8 - trustedBuilderAddresses: {} + auctioneerAddresses: {} # 1: "astria1ferdmm38w7zr4ankmntst0g0qg8e7ygeu3vxcy" ## Standard Eth Genesis config values # An EVM chain number id, different from the astria rollup name diff --git a/dev/values/rollup/dev.yaml b/dev/values/rollup/dev.yaml index 06367a68e1..b317180a9f 100644 --- a/dev/values/rollup/dev.yaml +++ b/dev/values/rollup/dev.yaml @@ -57,7 +57,7 @@ evm-rollup: # minBaseFee: 0 # elasticityMultiplier: 2 # baseFeeChangeDenominator: 8 - trustedBuilderAddresses: + auctioneerAddresses: 1: "astria1ferdmm38w7zr4ankmntst0g0qg8e7ygeu3vxcy" ## Standard Eth Genesis config values @@ -88,6 +88,7 @@ evm-rollup: logLevel: "debug" conductor: + # Determines what will drive block execution, options are: # Determines what will drive block execution, options are: # - "SoftOnly" -> blocks are only pulled from the sequencer # - "FirmOnly" -> blocks are only pulled from DA From 6ed6a8810778da7aee4ac1f933190111fc9f9f38 Mon Sep 17 00:00:00 2001 From: Bharath Date: Thu, 21 Nov 2024 15:46:54 +0530 Subject: [PATCH 03/10] update version number in charts --- charts/evm-rollup/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml index c55081c828..7ca3fcb1bd 100644 --- a/charts/evm-rollup/Chart.yaml +++ b/charts/evm-rollup/Chart.yaml @@ -15,13 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 +version: 1.0.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0" +appVersion: "1.0.1" maintainers: - name: wafflesvonmaple From 6969701471abbcb9a877563933cd8fa3f8daa77f Mon Sep 17 00:00:00 2001 From: Bharath Date: Thu, 21 Nov 2024 16:21:23 +0530 Subject: [PATCH 04/10] update evm-stack versions --- charts/evm-stack/Chart.lock | 6 +++--- charts/evm-stack/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock index 142c15567e..e8c6dc6a03 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -4,7 +4,7 @@ dependencies: version: 0.4.0 - name: evm-rollup repository: file://../evm-rollup - version: 1.0.0 + version: 1.0.1 - name: composer repository: file://../composer version: 1.0.0 @@ -20,5 +20,5 @@ dependencies: - name: blockscout-stack repository: https://blockscout.github.io/helm-charts version: 1.6.8 -digest: sha256:618d0978ce1fa169bffa360010e8afeb06f21ffb7574e8a298d1d561bbcee05b -generated: "2024-11-11T13:27:42.868678+02:00" +digest: sha256:b24083a75d7242a95b7b98176e67e429c30fb33192769252f40555077034e244 +generated: "2024-11-21T16:21:00.174496+05:30" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index 990a8c4c53..e7129aef67 100644 --- a/charts/evm-stack/Chart.yaml +++ b/charts/evm-stack/Chart.yaml @@ -23,7 +23,7 @@ dependencies: repository: "file://../celestia-node" condition: celestia-node.enabled - name: evm-rollup - version: 1.0.0 + version: 1.0.1 repository: "file://../evm-rollup" - name: composer version: 1.0.0 From 58adcaa866e17a551c16079eb20511e87bab4dc1 Mon Sep 17 00:00:00 2001 From: Bharath Date: Thu, 21 Nov 2024 16:24:12 +0530 Subject: [PATCH 05/10] bump version of evm-stack --- charts/evm-stack/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index e7129aef67..b790ec5af6 100644 --- a/charts/evm-stack/Chart.yaml +++ b/charts/evm-stack/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.3 +version: 1.0.4 dependencies: - name: celestia-node From 3a708af5f024dfe8ea42a807e4eacb67aea1e716 Mon Sep 17 00:00:00 2001 From: Bharath Date: Thu, 21 Nov 2024 16:39:30 +0530 Subject: [PATCH 06/10] put astriaAuctioneerAddress under dev --- charts/evm-rollup/files/genesis/geth-genesis.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json index f67049c0c3..ec597918b1 100644 --- a/charts/evm-rollup/files/genesis/geth-genesis.json +++ b/charts/evm-rollup/files/genesis/geth-genesis.json @@ -38,9 +38,9 @@ "astriaBridgeAddresses": {{ toPrettyJson .Values.genesis.bridgeAddresses | indent 8 | trim }}, "astriaFeeCollectors": {{ toPrettyJson .Values.genesis.feeCollectors | indent 8 | trim }}, "astriaEIP1559Params": {{ toPrettyJson .Values.genesis.eip1559Params | indent 8 | trim }}, - "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}", - "astriaAuctioneerAddresses": {{ toPrettyJson .Values.genesis.auctioneerAddresses | indent 8 | trim }} + "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}" {{- if not .Values.global.dev }} + "astriaAuctioneerAddresses": {{ toPrettyJson .Values.genesis.auctioneerAddresses | indent 8 | trim }} {{- else }} {{- end }} }, From f3907ff5258c37b2714c40c11d7af9d584472484 Mon Sep 17 00:00:00 2001 From: Bharath Date: Thu, 21 Nov 2024 16:55:49 +0530 Subject: [PATCH 07/10] move astriaAuctioneerAddresses field to else arm --- charts/evm-rollup/files/genesis/geth-genesis.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json index ec597918b1..446ae4e4ca 100644 --- a/charts/evm-rollup/files/genesis/geth-genesis.json +++ b/charts/evm-rollup/files/genesis/geth-genesis.json @@ -40,8 +40,8 @@ "astriaEIP1559Params": {{ toPrettyJson .Values.genesis.eip1559Params | indent 8 | trim }}, "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}" {{- if not .Values.global.dev }} - "astriaAuctioneerAddresses": {{ toPrettyJson .Values.genesis.auctioneerAddresses | indent 8 | trim }} {{- else }} + "astriaAuctioneerAddresses": {{ toPrettyJson .Values.genesis.auctioneerAddresses | indent 8 | trim }} {{- end }} }, "difficulty": "0", From 97f58a6fa44e9ac57a831f0011b12f5d8055fcb4 Mon Sep 17 00:00:00 2001 From: Bharath Date: Thu, 21 Nov 2024 17:28:58 +0530 Subject: [PATCH 08/10] add image which supports flame auctioneer --- charts/evm-rollup/files/genesis/geth-genesis.json | 2 +- charts/evm-rollup/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json index 446ae4e4ca..964fc49323 100644 --- a/charts/evm-rollup/files/genesis/geth-genesis.json +++ b/charts/evm-rollup/files/genesis/geth-genesis.json @@ -38,7 +38,7 @@ "astriaBridgeAddresses": {{ toPrettyJson .Values.genesis.bridgeAddresses | indent 8 | trim }}, "astriaFeeCollectors": {{ toPrettyJson .Values.genesis.feeCollectors | indent 8 | trim }}, "astriaEIP1559Params": {{ toPrettyJson .Values.genesis.eip1559Params | indent 8 | trim }}, - "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}" + "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}"{{- if .Values.global.dev }},{{ end }} {{- if not .Values.global.dev }} {{- else }} "astriaAuctioneerAddresses": {{ toPrettyJson .Values.genesis.auctioneerAddresses | indent 8 | trim }} diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 76a0c5f671..55dad495e1 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -10,8 +10,8 @@ images: geth: repo: ghcr.io/astriaorg/astria-geth pullPolicy: IfNotPresent - tag: 1.0.0 - devTag: latest + tag: "auctioneer" + devTag: "auctioneer" overrideTag: "" conductor: repo: ghcr.io/astriaorg/conductor From 5338eab5144e255b0d93135ec69a8171b58e0e79 Mon Sep 17 00:00:00 2001 From: Bharath Date: Fri, 22 Nov 2024 11:18:39 +0530 Subject: [PATCH 09/10] use flame image --- charts/evm-rollup/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 55dad495e1..3642df2803 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -8,10 +8,10 @@ global: images: geth: - repo: ghcr.io/astriaorg/astria-geth + repo: ghcr.io/astriaorg/flame pullPolicy: IfNotPresent - tag: "auctioneer" - devTag: "auctioneer" + tag: "sha-e389b82" + devTag: "sha-e389b82" overrideTag: "" conductor: repo: ghcr.io/astriaorg/conductor From f4b3e70937fa0678540e6e353debdb0c72ea194b Mon Sep 17 00:00:00 2001 From: Bharath Date: Fri, 22 Nov 2024 14:42:00 +0530 Subject: [PATCH 10/10] expose flame grpc service --- charts/evm-rollup/templates/service.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/evm-rollup/templates/service.yaml b/charts/evm-rollup/templates/service.yaml index a3c3ce26f4..4825d40dc8 100644 --- a/charts/evm-rollup/templates/service.yaml +++ b/charts/evm-rollup/templates/service.yaml @@ -13,6 +13,9 @@ spec: - name: ws-rpc-svc port: {{ .Values.ports.wsRPC }} targetPort: ws-rpc + - name: execution-grpc-svc + port: {{ .Values.ports.executionGRPC }} + targetPort: execution-grpc --- {{- if .Values.metrics.enabled }} kind: Service