Skip to content

Commit

Permalink
fix charts
Browse files Browse the repository at this point in the history
  • Loading branch information
@ethanoroshiba
ethanoroshiba committed Dec 13, 2024
1 parent fa7af2a commit ea80fbb
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 39 deletions.
48 changes: 27 additions & 21 deletions charts/evm-rollup/files/genesis/geth-genesis.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
{{- if .Values.genesis.cancunTime }}
"cancunTime": {{ toString .Values.genesis.cancunTime | replace "\"" "" }},
{{- end }}
{{- if .Values.genesis.cancunTime }}
{{- if .Values.genesis.pragueTime }}
"pragueTime": {{ toString .Values.genesis.pragueTime | replace "\"" "" }},
{{- end }}
{{- if .Values.genesis.cancunTime }}
{{- if .Values.genesis.verkleTime }}
"verkleTime": {{ toString .Values.genesis.verkleTime | replace "\"" "" }},
{{- end }}
"terminalTotalDifficulty": 0,
Expand All @@ -29,35 +29,41 @@
{{- end }}
"astriaOverrideGenesisExtraData": {{ .Values.genesis.overrideGenesisExtraData }},
"astriaRollupName": "{{ tpl .Values.genesis.rollupName . }}",
{{- if not .Values.global.dev }}
{{- else }}
"astriaForks": {
"genesis": {
"height": {{ toString .Values.genesis.forks.genesis.height | replace "\"" "" }},
"halt": {{ toString .Values.genesis.forks.genesis.halt | replace "\"" "" }},
"snapshotChecksum": {{ toString .Values.genesis.forks.genesis.snapshotChecksum | replace "\"" "" }},
{{- if .Values.genesis.forks.genesis.extraDataOverride }}
"extraDataOverride": {{ toString .Values.genesis.forks.genesis.extraDataOverride }},
"height": {{ toString .Values.genesis.forks.launch.height | replace "\"" "" }},
{{- if .Values.genesis.forks.launch.halt }}
"halt": {{ toString .Values.genesis.forks.launch.halt | replace "\"" "" }},
{{- end }}
{{- if .Values.genesis.forks.launch.snapshotChecksum }}
"snapshotChecksum": {{ toString .Values.genesis.forks.launch.snapshotChecksum }},
{{- end }}
{{- if .Values.genesis.forks.launch.extraDataOverride }}
"extraDataOverride": {{ toString .Values.genesis.forks.launch.extraDataOverride }},
{{- end }}
"feeCollector": "{{ .Values.genesis.forks.launch.feeCollector }}",
{{- if .Values.genesis.forks.launch.eip1559Params }}
"eip1559Params": {{ toPrettyJson .Values.genesis.forks.launch.eip1559Params | indent 8 | trim }},
{{- end }}
"feeCollector": {{ toString .Values.genesis.forks.genesis.feeCollector | replace "\"" "" }},
"EIP1559Params": {{ toPrettyJson .Values.genesis.forks.genesis.eip1559Params | indent 8 | trim }},
"sequencer": {
"chainId": {{ toString .Values.genesis.forks.genesis.sequencerChainId | replace "\"" "" }},
"addressPrefix": {{ toString .Values.genesis.forks.genesis.sequencerAddressPrefix | replace "\"" "" }},
"startHeight": {{ toString .Values.genesis.forks.genesis.sequencerStartHeight | replace "\"" "" }},
"stopHeight": {{ toString .Values.genesis.forks.genesis.sequencerStopHeight | replace "\"" "" }},
"chainId": "{{ tpl .Values.genesis.forks.launch.sequencerChainId . }}",
"addressPrefix": "{{ .Values.genesis.forks.launch.sequencerAddressPrefix }}",
"startHeight": {{ toString .Values.genesis.forks.launch.sequencerStartHeight | replace "\"" "" }},
"stopHeight": {{ toString .Values.genesis.forks.launch.sequencerStopHeight | replace "\"" "" }}
},
"celestia": {
"chainId": {{ toString .Values.genesis.forks.genesis.celestiaChainId | replace "\"" "" }},
"startHeight": {{ toString .Values.genesis.forks.genesis.celestiaStartHeight | replace "\"" "" }},
"heightVariance": {{ toString .Values.genesis.forks.genesis.celestiaHeightVariance | replace "\"" "" }},
"chainId": "{{ tpl .Values.genesis.forks.launch.celestiaChainId . }}",
"startHeight": {{ toString .Values.genesis.forks.launch.celestiaStartHeight | replace "\"" "" }},
"heightVariance": {{ toString .Values.genesis.forks.launch.celestiaHeightVariance | replace "\"" "" }}
},
"bridgeAddresses": {{ toPrettyJson .Values.genesis.forks.genesisbridgeAddresses | indent 8 | trim }},
"bridgeAddresses": {{ toPrettyJson .Values.genesis.forks.launch.bridgeAddresses | indent 8 | trim }}
}
{{- if .Values.genesis.forks.additionalForks }}
{{ toPrettyJson .Values.genesis.forks.additionalForks | indent 8 | trim }}
, {{ toPrettyJson .Values.genesis.forks.additionalForks | indent 8 | trim }}
{{- end }}
},
}
{{- if not .Values.global.dev }}
{{- else }}
{{- end }}
},
"difficulty": "0",
Expand Down
23 changes: 5 additions & 18 deletions dev/values/rollup/dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,30 @@ global:
evm-rollup:
genesis:
# The name of the rollup chain, used to generate the Rollup ID
rollupName: "{{ tpl .dev.global.rollupName . }}"
rollupName: "{{ .Values.global.rollupName }}"

# The "forks" for upgrading the chain. Contains necessary information for starting
# and, if desired, restarting the chain at a given height. The necessary fields
# for the genesis fork are provided, and additional forks can be added as needed.
forks:
## These values are used to configure the genesis block of the rollup chain
## no defaults as they are unique to each chain
genesis:
launch:
# The block height to start the chain at, 0 for genesis
height: 0
# Whether to halt the rollup chain at the given height. False for genesis
halt: false
# Checksum of the snapshot to use upon restart
snapshotChecksum: ""
# Will fill the extra data in each block, can be left empty
# can also fill with something unique for your chain.
extraDataOverride: ""
# Configure the fee collector for the evm tx fees, activated at block heights.
# If not configured, all tx fees will be burned.
feeCollector: "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30"
# Configure EIP-1559 params, activated at block heights.
eip1559Params: {}
# The chain id of the sequencer chain
sequencerChainId: "{{ .dev.global.sequencerChainId }}"
sequencerChainId: "{{ .Values.global.sequencerChainId }}"
# The hrp for bech32m addresses, unlikely to be changed
sequencerAddressPrefix: "astria"
# Block height to start syncing rollup from, lowest possible is 2
sequencerStartHeight: 2
# Block height (on sequencer) to stop syncing rollup at, continuing to next configuration fork
sequencerStopHeight: ""
sequencerStopHeight: 0
# The chain id of the celestia chain
celestiaChainId: "{{ .dev.global.celestiaChainId }}"
celestiaChainId: "{{ .Values.global.celestiaChainId }}"
# The first Celestia height to utilize when looking for rollup data
celestiaStartHeight: 2
# The variance in Celestia height to allow before halting the chain
Expand All @@ -56,10 +47,6 @@ evm-rollup:
senderAddress: "0x0000000000000000000000000000000000000000"
assetDenom: "nria"
assetPrecision: 9
# JSON object with any additional desired forks. Can be used with any or all
# of the above fields. Any fields left empty will be populated with the previous
# fork's values.
additionalForks: {}

## These are general configuration values with some recommended defaults

Expand Down

0 comments on commit ea80fbb

Please sign in to comment.