test(ci): test pr-1929

.github/workflows/reusable-docker-build.yml

@@ -67,7 +67,8 @@ jobs:
           tags: |
             type=ref,event=pr
             type=match,pattern=refs/tags/${{ inputs.binary-name }}-v(.*),group=1,enable=${{ startsWith(env.FULL_REF, 'refs/tags/') }},value=${{ env.FULL_REF }}
-            type=sha
+            type=sha,format=short
+            type=sha,format=long
             # set the actual commit SHA from the PR head instead of from the PR merge commit (alternatively, we could checkout the PR head in actions/checkout)
             type=raw,value=sha-${{ github.event.pull_request.head.sha || github.sha }},enable=${{ startsWith(env.FULL_REF, 'refs/pull/') }}
             # set latest tag for `main` branch

buf.yaml

@@ -62,6 +62,8 @@ modules:
       ignore_only:
         PACKAGE_VERSION_SUFFIX:
           - proto/protocolapis/astria_vendored/tendermint
+        ENUM_ZERO_VALUE_SUFFIX:
+          - proto/protocolapis/astria_vendored/tendermint
       disallow_comment_ignores: true
     breaking:
       use:

charts/celestia-local/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: 0.7.1
+version: 0.7.2
 
 # 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

charts/celestia-node/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: 0.4.0
+version: 0.4.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

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

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",

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:

charts/evm-stack/Chart.lock

@@ -1,10 +1,10 @@
 dependencies:
 - name: celestia-node
   repository: file://../celestia-node
-  version: 0.4.0
+  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:371c35af96fc5d82aa2b4d894dc7d2e11e150380fd6f09eb0ca94b4202b24698
-generated: "2025-01-08T11:22:41.273867-08:00"
+digest: sha256:81e317678e8766eb8be8b7ba040e42367b5be6cd7a569ecaad3bb6cd6adc7516
+generated: "2025-01-22T15:49:18.754522137Z"

charts/evm-stack/Chart.yaml

@@ -15,15 +15,15 @@ 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.7
+version: 1.1.1
 
 dependencies:
   - name: celestia-node
-    version: 0.4.0
+    version: 0.4.1
     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

charts/hermes/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: 0.5.2
+version: 0.5.3
 
 # 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

charts/sequencer/Chart.lock

@@ -3,4 +3,4 @@ dependencies:
   repository: file://../sequencer-relayer
   version: 1.0.1
 digest: sha256:3b3ce65ff473606fcc86027653cadd212ba45ac8b39d5806d713b48f695ad235
-generated: "2024-11-20T11:24:11.85775+02:00"
+generated: "2024-12-23T18:31:36.564565164Z"

charts/sequencer/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.2
+version: 1.0.3
 # 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.

charts/sequencer/files/cometbft/config/config.toml

@@ -111,7 +111,7 @@ grpc_laddr = ""
 # 0 - unlimited.
 # Should be < {ulimit -Sn} - {MaxNumInboundPeers} - {MaxNumOutboundPeers} - {N of wal, db and other open files}
 # 1024 - 40 - 10 - 50 = 924 = ~900
-grpc_max_open_connections = {{ .Values.cometbft.config.grpc.maxOpenConnections }} 
+grpc_max_open_connections = {{ .Values.cometbft.config.grpc.maxOpenConnections }}
 
 # Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool
 unsafe = false

charts/sequencer/files/cometbft/config/genesis.json

@@ -108,7 +108,7 @@
       {{- if $index }},{{- end }}
       {
         "address": {{ include "sequencer.address" $value.address }},
-        "balance": {{ include "sequencer.toUint128Proto" ( toString $value.balance | replace "\"" "" ) }} 
+        "balance": {{ include "sequencer.toUint128Proto" ( toString $value.balance | replace "\"" "" ) }}
       }
       {{- end }}
     ],
@@ -119,11 +119,78 @@
       {{- if $index }},{{- end }}
       {{ include "sequencer.address" $value }}
       {{- end }}
-    ]
+    ],
     {{- if not .Values.global.dev }}
     {{- else }}
-    {{- end}}
+    "connect": {
+      "marketMap": {
+        "marketMap": {
+          "markets": {
+            {{- range $index, $market := .Values.sequencer.oracle.markets }}
+            {{- if $index }},{{- end }}
+            "{{ $market.name }}": {
+              "providerConfigs": [
+                {{- range $providerIndex, $provider := $market.providerConfigs }}
+                {{- if $providerIndex }},{{- end }}
+                {
+                  "name": "{{ $provider.name }}",
+                  {{- if $provider.normalizeByPair }}
+                  "normalizeByPair": {
+                    "Base": "{{ $provider.normalizeByPair.Base }}",
+                    "Quote": "{{ $provider.normalizeByPair.Quote }}"
+                  },
+                  {{- end }}
+                  "offChainTicker": "{{ $provider.offChainTicker }}"
+                }
+                {{- end }}
+              ],
+              "ticker": {
+                "currencyPair": {
+                  "Base": "{{ $market.ticker.currencyPair.Base }}",
+                  "Quote": "{{ $market.ticker.currencyPair.Quote }}"
+                },
+                "decimals": "{{ $market.ticker.decimals }}",
+                "enabled": {{ $market.ticker.enabled }},
+                "minProviderCount": "{{ $market.ticker.minProviderCount }}"
+              }
+            }
+            {{- end }}
+          }
+        },
+        "params": {
+          "admin": "{{ .Values.genesis.oracle.marketAdminAddress }}",
+          "marketAuthorities": [
+            {{- range $index, $authority := .Values.genesis.oracle.marketAuthorities }}
+            {{- if $index }},{{- end }}
+            "{{ $authority }}"
+            {{- end }}
+          ]
+        }
+      },
+      "oracle": {
+        "currencyPairGenesis": [
+          {{- range $index, $genesis := .Values.sequencer.oracle.currencyPairGenesis }}
+          {{- if $index }},{{- end }}
+          {
+            "currencyPair": {
+              "Base": "{{ $genesis.currencyPair.Base }}",
+              "Quote": "{{ $genesis.currencyPair.Quote }}"
+            },
+            "currencyPairPrice": {
+              "blockTimestamp": "{{ $genesis.currencyPairPrice.blockTimestamp }}",
+              "price": "{{ $genesis.currencyPairPrice.price }}"
+            }
+            {{- if $genesis.id }},
+            "id": "{{ $genesis.id }}"
+            {{- end }}
+          }
+          {{- end }}
+        ],
+        "nextId": "{{ .Values.sequencer.oracle.nextId }}"
+      }
+    }
   },
+  {{- end}}
   "chain_id": "{{ .Values.genesis.chainId }}",
   "consensus_params": {
     "block": {
@@ -142,6 +209,9 @@
     },
     "version": {
       "app": "0"
+    },
+    "abci": {
+      "vote_extensions_enable_height": "{{ .Values.genesis.consensusParams.voteExtensionsEnableHeight }}"
     }
   },
   "genesis_time": "{{ .Values.genesis.genesisTime }}",

charts/sequencer/files/scripts/markets.json

@@ -0,0 +1,38 @@
+{
+  "markets": {
+    "BTC/USD": {
+      "ticker": {
+        "currency_pair": {
+          "Base": "BTC",
+          "Quote": "USD"
+        },
+        "decimals": 5,
+        "min_provider_count": 1,
+        "enabled": true
+      },
+      "provider_configs": [
+        {
+          "name": "coingecko_api",
+          "off_chain_ticker": "bitcoin/usd"
+        }
+      ]
+    },
+    "ETH/USD": {
+      "ticker": {
+        "currency_pair": {
+          "Base": "ETH",
+          "Quote": "USD"
+        },
+        "decimals": 6,
+        "min_provider_count": 1,
+        "enabled": true
+      },
+      "provider_configs": [
+        {
+          "name": "coingecko_api",
+          "off_chain_ticker": "ethereum/usd"
+        }
+      ]
+    }
+  }
+}

charts/sequencer/templates/_helpers.tpl

@@ -11,6 +11,9 @@ Namepsace to deploy elements into.
 {{- define "cometBFT.image" -}}
 {{ .Values.images.cometBFT.repo }}:{{ if .Values.global.dev }}{{ .Values.images.cometBFT.devTag }}{{ else }}{{ .Values.images.cometBFT.tag }}{{ end }}
 {{- end }}
+{{- define "connect.image" -}}
+{{ .Values.images.connect.repo }}:{{ if .Values.global.dev }}{{ .Values.images.connect.devTag }}{{ else }}{{ .Values.images.connect.tag }}{{ end }}
+{{- end }}
 
 {{/*
 Return if ingress is stable.

charts/sequencer/templates/configmaps.yaml

@@ -30,6 +30,11 @@ metadata:
 data:
   init-cometbft.sh: |
     {{- tpl (.Files.Get "files/scripts/init-cometbft.sh") $ | nindent 4 }}
+  {{- if not .Values.global.dev }}
+  {{- else }}
+  markets.json: |
+    {{- tpl (.Files.Get "files/scripts/markets.json") $ | nindent 4 }}
+  {{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -75,5 +80,8 @@ data:
   OTEL_SERVICE_NAME: "{{ tpl .Values.sequencer.otel.serviceName . }}"
   {{- if not .Values.global.dev }}
   {{- else }}
+  ASTRIA_SEQUENCER_NO_ORACLE: "{{ not .Values.sequencer.oracle.enabled }}"
+  ASTRIA_SEQUENCER_ORACLE_GRPC_ADDR: "http://127.0.0.1:{{ .Values.ports.oracleGrpc }}"
+  ASTRIA_SEQUENCER_ORACLE_CLIENT_TIMEOUT_MILLISECONDS: "{{ .Values.sequencer.oracle.clientTimeout }}"
   {{- end }}
 ---