diff --git a/charts/evm-rollup/Chart.yaml b/charts/evm-rollup/Chart.yaml index 482a162569..fd614d54d6 100644 --- a/charts/evm-rollup/Chart.yaml +++ b/charts/evm-rollup/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.1 +version: 1.1.0 # 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 diff --git a/charts/evm-rollup/files/genesis/geth-genesis.json b/charts/evm-rollup/files/genesis/geth-genesis.json index 68027198d0..8ad0e25087 100644 --- a/charts/evm-rollup/files/genesis/geth-genesis.json +++ b/charts/evm-rollup/files/genesis/geth-genesis.json @@ -38,9 +38,11 @@ "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 not .Values.global.dev }} {{- else }} + "astriaOracleCallerAddress": "{{ .Values.genesis.astriaOracleCallerAddress }}", + "astriaOracleContractAddress": "{{ .Values.genesis.astriaOracleContractAddress }}" {{- end }} }, "difficulty": "0", diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml index 5437e0c07d..2ed5e1c5b6 100644 --- a/charts/evm-rollup/values.yaml +++ b/charts/evm-rollup/values.yaml @@ -11,13 +11,13 @@ images: repo: ghcr.io/astriaorg/astria-geth pullPolicy: IfNotPresent tag: 1.0.0 - devTag: latest + devTag: sha-a9d1e6a overrideTag: "" conductor: repo: ghcr.io/astriaorg/conductor pullPolicy: IfNotPresent tag: 1.0.0 - devTag: latest + devTag: pr-1866 genesis: @@ -57,6 +57,14 @@ genesis: # senderAddress: "0x0000000000000000000000000000000000000000" # assetPrecision: 9 + ## Native oracle configuration + + # address from which injected oracle transactions are called from; + # must not have a known private key for mainnet + astriaOracleCallerAddress: "0x0000000000000000000000000000000000000088" + # address where the oracle contract is deployed at (at genesis) + # must match the `alloc` genesis field + astriaOracleContractAddress: "0x0000000000000000000000000000000000000089" ## Fee configuration @@ -89,6 +97,10 @@ genesis: value: balance: "0" code: "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3" + - address: "0x0000000000000000000000000000000000000089" ## oracle contract + value: + balance: "0" + code: "0x608060405234801561001057600080fd5b50600436106100625760003560e01c80633595f6911461006757806338013f021461007c5780634599c788146100c057806348832f3c146100d7578063859bd5b5146100ea578063dad84e9d1461012f575b600080fd5b61007a610075366004610597565b610189565b005b6100a37f000000000000000000000000000000000000000000000000000000000000008881565b6040516001600160a01b0390911681526020015b60405180910390f35b6100c960025481565b6040519081526020016100b7565b61007a6100e5366004610650565b6103de565b6101166100f8366004610686565b60006020819052908152604090205460ff8082169161010090041682565b60408051921515835260ff9091166020830152016100b7565b61016a61013d36600461069f565b6001602081815260009384526040808520909152918352912080549101546001600160801b039091169082565b604080516001600160801b0390931683526020830191909152016100b7565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000008816146101da5760405162461bcd60e51b81526004016101d1906106c1565b60405180910390fd5b805182511461023b5760405162461bcd60e51b815260206004820152602760248201527f63757272656e6379207061697220616e64207072696365206c656e677468206d6044820152660d2e6dac2e8c6d60cb1b60648201526084016101d1565b4360025560005b82518110156103d95760008084838151811061026057610260610705565b60209081029190910181015182528101919091526040016000205460ff1661029e5760405163183c4ba760e01b8152600481018290526024016101d1565b60405180604001604052808383815181106102bb576102bb610705565b60200260200101516001600160801b031681526020014281525060016000600254815260200190815260200160002060008584815181106102fe576102fe610705565b602090810291909101810151825281810192909252604001600020825181546fffffffffffffffffffffffffffffffff19166001600160801b0390911617815591015160019091015582517fd616ae5f8d378c1264fdbbbc72af91e16e3645564d7eae37e267ef1c67bf5cee9084908390811061037d5761037d610705565b602002602001015183838151811061039757610397610705565b60200260200101516040516103bf9291909182526001600160801b0316602082015260400190565b60405180910390a1806103d18161071b565b915050610242565b505050565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000008816146104265760405162461bcd60e51b81526004016101d1906106c1565b6040805180820182526001815260ff8381166020808401828152600088815280835286902094518554915161ffff1990921690151561ff001916176101009190941602929092179092558251858152908101919091527f675b5c62c7826a107baf315a10339c41c59f32f58ac6431f359e9ac89c64a01b910160405180910390a15050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff811182821017156104ea576104ea6104ab565b604052919050565b600067ffffffffffffffff82111561050c5761050c6104ab565b5060051b60200190565b600082601f83011261052757600080fd5b8135602061053c610537836104f2565b6104c1565b82815260059290921b8401810191818101908684111561055b57600080fd5b8286015b8481101561058c5780356001600160801b038116811461057f5760008081fd5b835291830191830161055f565b509695505050505050565b600080604083850312156105aa57600080fd5b823567ffffffffffffffff808211156105c257600080fd5b818501915085601f8301126105d657600080fd5b813560206105e6610537836104f2565b82815260059290921b8401810191818101908984111561060557600080fd5b948201945b838610156106235785358252948201949082019061060a565b9650508601359250508082111561063957600080fd5b5061064685828601610516565b9150509250929050565b6000806040838503121561066357600080fd5b82359150602083013560ff8116811461067b57600080fd5b809150509250929050565b60006020828403121561069857600080fd5b5035919050565b600080604083850312156106b257600080fd5b50508035926020909101359150565b60208082526024908201527f4173747269614f7261636c653a206f6e6c79206f7261636c652063616e2075706040820152636461746560e01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b60006001820161073b57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220954daeeb3d6446ed3eab09836d7e88f4deb3f3294e39a86c34bbf6ab94e89e2e64736f6c63430008150033" # Example of simple genesis account funding # - address: "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30" # value: @@ -159,7 +171,8 @@ config: condition: .Values.metrics.enabled - name: txpool.nolocals value: "true" - + - name: verbosity + value: "4" # 3=info, 4=debug conductor: # Determines what will drive block execution, options are: diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock index 1e2a93851f..1903e5ebfa 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -4,7 +4,7 @@ dependencies: version: 0.4.1 - name: evm-rollup repository: file://../evm-rollup - version: 1.0.1 + version: 1.1.0 - 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:60114ff7e0e79afb1f6f4e53188b255ef2fbfcf85a0af923e758bafc6f69e015 -generated: "2024-12-23T18:30:12.119377323Z" +digest: sha256:7920e0f663dca131ade762d5a5f3db71e30b9c88f64b2f4376b699a9fcf2d222 +generated: "2025-01-08T10:49:45.20252158-05:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index 02973c627a..f423b7bfa1 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.1 + version: 1.1.0 repository: "file://../evm-rollup" - name: composer version: 1.0.0 diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index d54ec479ab..58081eebb7 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -24,7 +24,7 @@ images: repo: ghcr.io/astriaorg/sequencer pullPolicy: IfNotPresent tag: 1.0.0 - devTag: sha-80be7eb + devTag: pr-1866 connect: repo: ghcr.io/skip-mev/connect-sidecar pullPolicy: IfNotPresent diff --git a/dev/values/rollup/dev.yaml b/dev/values/rollup/dev.yaml index 0d9be85422..7920781bc4 100644 --- a/dev/values/rollup/dev.yaml +++ b/dev/values/rollup/dev.yaml @@ -44,6 +44,14 @@ evm-rollup: assetDenom: "nria" assetPrecision: 9 + ## Native oracle configuration + + # address from which injected oracle transactions are called from; + # must not have a known private key for mainnet + astriaOracleCallerAddress: "0x0000000000000000000000000000000000000088" + # address where the oracle contract is deployed at (at genesis) + # must match the `alloc` genesis field + astriaOracleContractAddress: "0x0000000000000000000000000000000000000089" ## Fee configuration @@ -78,7 +86,10 @@ evm-rollup: value: balance: "0" code: "0x6080604052600436106100f35760003560e01c8063b6476c7e1161008a578063e74b981b11610059578063e74b981b1461027b578063ebd090541461029b578063f2fde38b146102bb578063fc88d31b146102db57600080fd5b8063b6476c7e1461021c578063bab916d01461023e578063d294f09314610251578063db97dc981461026657600080fd5b80638da5cb5b116100c65780638da5cb5b146101a1578063a7eaa739146101d3578063a996e020146101f3578063ad2282471461020657600080fd5b80636f46384a146100f8578063715018a6146101215780637eb6dec7146101385780638897397914610181575b600080fd5b34801561010457600080fd5b5061010e60035481565b6040519081526020015b60405180910390f35b34801561012d57600080fd5b506101366102f1565b005b34801561014457600080fd5b5061016c7f000000000000000000000000000000000000000000000000000000000000000981565b60405163ffffffff9091168152602001610118565b34801561018d57600080fd5b5061013661019c3660046107a6565b610305565b3480156101ad57600080fd5b506000546001600160a01b03165b6040516001600160a01b039091168152602001610118565b3480156101df57600080fd5b506101366101ee3660046107a6565b610312565b610136610201366004610808565b61031f565b34801561021257600080fd5b5061010e60065481565b34801561022857600080fd5b50610231610414565b6040516101189190610874565b61013661024c3660046108c3565b6104a2565b34801561025d57600080fd5b50610136610588565b34801561027257600080fd5b506102316106b4565b34801561028757600080fd5b50610136610296366004610905565b6106c1565b3480156102a757600080fd5b506005546101bb906001600160a01b031681565b3480156102c757600080fd5b506101366102d6366004610905565b6106eb565b3480156102e757600080fd5b5061010e60045481565b6102f9610729565b6103036000610756565b565b61030d610729565b600455565b61031a610729565b600355565b3460045480821161034b5760405162461bcd60e51b815260040161034290610935565b60405180910390fd5b60007f000000000000000000000000000000000000000000000000000000003b9aca006103788385610998565b61038291906109b1565b1161039f5760405162461bcd60e51b8152600401610342906109d3565b600454600660008282546103b39190610a61565b90915550506004546103c59034610998565b336001600160a01b03167f0c64e29a5254a71c7f4e52b3d2d236348c80e00a00ba2e1961962bd2827c03fb888888886040516104049493929190610a9d565b60405180910390a3505050505050565b6002805461042190610acf565b80601f016020809104026020016040519081016040528092919081815260200182805461044d90610acf565b801561049a5780601f1061046f5761010080835404028352916020019161049a565b820191906000526020600020905b81548152906001019060200180831161047d57829003601f168201915b505050505081565b346003548082116104c55760405162461bcd60e51b815260040161034290610935565b60007f000000000000000000000000000000000000000000000000000000003b9aca006104f28385610998565b6104fc91906109b1565b116105195760405162461bcd60e51b8152600401610342906109d3565b6003546006600082825461052d9190610a61565b909155505060035461053f9034610998565b336001600160a01b03167f0f4961cab7530804898499aa89f5ec81d1a73102e2e4a1f30f88e5ae3513ba2a868660405161057a929190610b09565b60405180910390a350505050565b6005546001600160a01b031633146105f45760405162461bcd60e51b815260206004820152602960248201527f41737472696142726964676561626c6545524332303a206f6e6c7920666565206044820152681c9958da5c1a595b9d60ba1b6064820152608401610342565b6005546006546040516000926001600160a01b031691908381818185875af1925050503d8060008114610643576040519150601f19603f3d011682016040523d82523d6000602084013e610648565b606091505b50509050806106ac5760405162461bcd60e51b815260206004820152602a60248201527f41737472696142726964676561626c6545524332303a20666565207472616e7360448201526919995c8819985a5b195960b21b6064820152608401610342565b506000600655565b6001805461042190610acf565b6106c9610729565b600580546001600160a01b0319166001600160a01b0392909216919091179055565b6106f3610729565b6001600160a01b03811661071d57604051631e4fbdf760e01b815260006004820152602401610342565b61072681610756565b50565b6000546001600160a01b031633146103035760405163118cdaa760e01b8152336004820152602401610342565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156107b857600080fd5b5035919050565b60008083601f8401126107d157600080fd5b50813567ffffffffffffffff8111156107e957600080fd5b60208301915083602082850101111561080157600080fd5b9250929050565b6000806000806040858703121561081e57600080fd5b843567ffffffffffffffff8082111561083657600080fd5b610842888389016107bf565b9096509450602087013591508082111561085b57600080fd5b50610868878288016107bf565b95989497509550505050565b60006020808352835180602085015260005b818110156108a257858101830151858201604001528201610886565b506000604082860101526040601f19601f8301168501019250505092915050565b600080602083850312156108d657600080fd5b823567ffffffffffffffff8111156108ed57600080fd5b6108f9858286016107bf565b90969095509350505050565b60006020828403121561091757600080fd5b81356001600160a01b038116811461092e57600080fd5b9392505050565b6020808252602d908201527f417374726961576974686472617765723a20696e73756666696369656e74207760408201526c69746864726177616c2066656560981b606082015260800190565b634e487b7160e01b600052601160045260246000fd5b818103818111156109ab576109ab610982565b92915050565b6000826109ce57634e487b7160e01b600052601260045260246000fd5b500490565b60208082526062908201527f417374726961576974686472617765723a20696e73756666696369656e74207660408201527f616c75652c206d7573742062652067726561746572207468616e203130202a2a60608201527f20283138202d20424153455f434841494e5f41535345545f505245434953494f6080820152614e2960f01b60a082015260c00190565b808201808211156109ab576109ab610982565b81835281816020850137506000828201602090810191909152601f909101601f19169091010190565b604081526000610ab1604083018688610a74565b8281036020840152610ac4818587610a74565b979650505050505050565b600181811c90821680610ae357607f821691505b602082108103610b0357634e487b7160e01b600052602260045260246000fd5b50919050565b602081526000610b1d602083018486610a74565b94935050505056fea2646970667358221220842bd8104ffc1c611919341f64a8277f2fc808138b97720a6dc1382e5670099064736f6c63430008190033" - + - address: "0x0000000000000000000000000000000000000089" ## oracle contract + value: + balance: "0" + code: "0x608060405234801561001057600080fd5b50600436106100625760003560e01c80633595f6911461006757806338013f021461007c5780634599c788146100c057806348832f3c146100d7578063859bd5b5146100ea578063dad84e9d1461012f575b600080fd5b61007a610075366004610597565b610189565b005b6100a37f000000000000000000000000000000000000000000000000000000000000008881565b6040516001600160a01b0390911681526020015b60405180910390f35b6100c960025481565b6040519081526020016100b7565b61007a6100e5366004610650565b6103de565b6101166100f8366004610686565b60006020819052908152604090205460ff8082169161010090041682565b60408051921515835260ff9091166020830152016100b7565b61016a61013d36600461069f565b6001602081815260009384526040808520909152918352912080549101546001600160801b039091169082565b604080516001600160801b0390931683526020830191909152016100b7565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000008816146101da5760405162461bcd60e51b81526004016101d1906106c1565b60405180910390fd5b805182511461023b5760405162461bcd60e51b815260206004820152602760248201527f63757272656e6379207061697220616e64207072696365206c656e677468206d6044820152660d2e6dac2e8c6d60cb1b60648201526084016101d1565b4360025560005b82518110156103d95760008084838151811061026057610260610705565b60209081029190910181015182528101919091526040016000205460ff1661029e5760405163183c4ba760e01b8152600481018290526024016101d1565b60405180604001604052808383815181106102bb576102bb610705565b60200260200101516001600160801b031681526020014281525060016000600254815260200190815260200160002060008584815181106102fe576102fe610705565b602090810291909101810151825281810192909252604001600020825181546fffffffffffffffffffffffffffffffff19166001600160801b0390911617815591015160019091015582517fd616ae5f8d378c1264fdbbbc72af91e16e3645564d7eae37e267ef1c67bf5cee9084908390811061037d5761037d610705565b602002602001015183838151811061039757610397610705565b60200260200101516040516103bf9291909182526001600160801b0316602082015260400190565b60405180910390a1806103d18161071b565b915050610242565b505050565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000008816146104265760405162461bcd60e51b81526004016101d1906106c1565b6040805180820182526001815260ff8381166020808401828152600088815280835286902094518554915161ffff1990921690151561ff001916176101009190941602929092179092558251858152908101919091527f675b5c62c7826a107baf315a10339c41c59f32f58ac6431f359e9ac89c64a01b910160405180910390a15050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff811182821017156104ea576104ea6104ab565b604052919050565b600067ffffffffffffffff82111561050c5761050c6104ab565b5060051b60200190565b600082601f83011261052757600080fd5b8135602061053c610537836104f2565b6104c1565b82815260059290921b8401810191818101908684111561055b57600080fd5b8286015b8481101561058c5780356001600160801b038116811461057f5760008081fd5b835291830191830161055f565b509695505050505050565b600080604083850312156105aa57600080fd5b823567ffffffffffffffff808211156105c257600080fd5b818501915085601f8301126105d657600080fd5b813560206105e6610537836104f2565b82815260059290921b8401810191818101908984111561060557600080fd5b948201945b838610156106235785358252948201949082019061060a565b9650508601359250508082111561063957600080fd5b5061064685828601610516565b9150509250929050565b6000806040838503121561066357600080fd5b82359150602083013560ff8116811461067b57600080fd5b809150509250929050565b60006020828403121561069857600080fd5b5035919050565b600080604083850312156106b257600080fd5b50508035926020909101359150565b60208082526024908201527f4173747269614f7261636c653a206f6e6c79206f7261636c652063616e2075706040820152636461746560e01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b60006001820161073b57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220954daeeb3d6446ed3eab09836d7e88f4deb3f3294e39a86c34bbf6ab94e89e2e64736f6c63430008150033" config: # The level at which core astria components will log out