Apply new storage conventions to Connect oracle

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.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.

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

@@ -119,13 +119,31 @@
       {{- if $index }},{{- end }}
       {{ include "sequencer.address" $value }}
       {{- end }}
-    ]
+    ],
+    "connect": {
+      "marketMap": {
+        "marketMap": {
+          "markets": {}
+        },
+        "params": {
+          "marketAuthorities": [],
+          "admin": "{{ .Values.genesis.marketAdminAddress }}"
+        }
+      },
+      "oracle": {
+        "currencyPairGenesis": [],
+        "nextId": "0"
+      }
+    }
     {{- if not .Values.global.dev }}
     {{- else }}
     {{- end}}
   },
   "chain_id": "{{ .Values.genesis.chainId }}",
   "consensus_params": {
+    "abci": {
+      "vote_extensions_enable_height": "1"
+    },
     "block": {
       "max_bytes": " {{ .Values.genesis.consensusParams.blockMaxBytes }}",
       "max_gas": "{{ .Values.genesis.consensusParams.blockMaxGas }}"

charts/sequencer/templates/configmaps.yaml

@@ -73,7 +73,10 @@ data:
   OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.sequencer.otel.otlpHeaders }}"
   OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.sequencer.otel.traceHeaders }}"
   OTEL_SERVICE_NAME: "{{ tpl .Values.sequencer.otel.serviceName . }}"
+  ASTRIA_SEQUENCER_CONNECT_GRPC_ADDR: "http://127.0.0.1:8081"
+  ASTRIA_SEQUENCER_ORACLE_CLIENT_TIMEOUT_MILLISECONDS: "1000"
   {{- if not .Values.global.dev }}
   {{- else }}
+  ASTRIA_SEQUENCER_NO_ORACLE: "true"
   {{- end }}
 ---

charts/sequencer/values.yaml

@@ -34,6 +34,7 @@ genesis:
     base: "astria"
     ibcCompat: "astriacompat"
   authoritySudoAddress: ""
+  marketAdminAddress: ""
   allowedFeeAssets: []
     # - nria
   ibc:
@@ -271,6 +272,7 @@ ports:
   cometbftRpc: 26657
   cometbftMetrics: 26660
   sequencerABCI: 26658
+  # note: the oracle sidecar also uses 8080 by default but can be changed with --port
   sequencerGrpc: 8080
   relayerRpc: 2450
   sequencerMetrics: 9000

crates/astria-core/Cargo.toml

@@ -36,6 +36,7 @@ penumbra-ibc = { workspace = true }
 penumbra-proto = { workspace = true }
 prost = { workspace = true }
 rand = { workspace = true }
+regex = { workspace = true }
 serde = { workspace = true, features = ["derive"], optional = true }
 sha2 = { workspace = true }
 tendermint = { workspace = true }

crates/astria-core/src/connect/abci.rs

@@ -0,0 +1,74 @@
+pub mod v2 {
+    use bytes::Bytes;
+    use indexmap::IndexMap;
+
+    use crate::{
+        connect::types::v2::{
+            CurrencyPairId,
+            Price,
+        },
+        generated::connect::abci::v2 as raw,
+    };
+
+    #[derive(Debug, thiserror::Error)]
+    #[error(transparent)]
+    pub struct OracleVoteExtensionError(#[from] OracleVoteExtensionErrorKind);
+
+    #[derive(Debug, thiserror::Error)]
+    #[error("failed to validate connect.abci.v2.OracleVoteExtension")]
+    enum OracleVoteExtensionErrorKind {
+        #[error("failed decoding price value in .prices field for key `{id}`")]
+        DecodePrice {
+            id: u64,
+            source: crate::connect::types::v2::DecodePriceError,
+        },
+    }
+
+    #[derive(Debug, Clone, PartialEq, Eq)]
+    pub struct OracleVoteExtension {
+        pub prices: IndexMap<CurrencyPairId, Price>,
+    }
+
+    impl OracleVoteExtension {
+        /// Converts an on-wire [`raw::OracleVoteExtension`] to a validated domain type
+        /// [`OracleVoteExtension`].
+        ///
+        /// # Errors
+        /// Returns an error if a value in the `.prices` map could not be validated.
+        pub fn try_from_raw(
+            raw: raw::OracleVoteExtension,
+        ) -> Result<Self, OracleVoteExtensionError> {
+            let prices = raw
+                .prices
+                .into_iter()
+                .map(|(id, price)| {
+                    let price = Price::try_from(price).map_err(|source| {
+                        OracleVoteExtensionErrorKind::DecodePrice {
+                            id,
+                            source,
+                        }
+                    })?;
+                    Ok::<_, OracleVoteExtensionErrorKind>((CurrencyPairId::new(id), price))
+                })
+                .collect::<Result<_, _>>()?;
+            Ok(Self {
+                prices,
+            })
+        }
+
+        #[must_use]
+        pub fn into_raw(self) -> raw::OracleVoteExtension {
+            fn encode_price(input: Price) -> Bytes {
+                Bytes::copy_from_slice(&input.get().to_be_bytes())
+            }
+
+            raw::OracleVoteExtension {
+                prices: self
+                    .prices
+                    .into_iter()
+                    .map(|(id, price)| (id.get(), encode_price(price)))
+                    .collect(),
+            }
+        }
+    }
+}