From cd12f1214d250b239aaf3b237f9600afdce87b22 Mon Sep 17 00:00:00 2001 From: Fraser Hutchison Date: Tue, 21 Jan 2025 18:55:36 +0000 Subject: [PATCH 1/2] rename connect oracle to price feed --- charts/sequencer/Chart.yaml | 2 +- .../files/cometbft/config/genesis.json | 12 +- charts/sequencer/templates/_helpers.tpl | 4 +- charts/sequencer/templates/configmaps.yaml | 6 +- charts/sequencer/templates/service.yaml | 10 +- .../sequencer/templates/servicemonitor.yaml | 4 +- charts/sequencer/templates/statefulsets.yaml | 16 +- charts/sequencer/values.yaml | 12 +- .../src/celestia/block_verifier.rs | 2 +- crates/astria-conductor/src/celestia/mod.rs | 2 +- crates/astria-conductor/src/executor/mod.rs | 25 +- .../tests/blackbox/helpers/macros.rs | 4 +- .../generated/astria.protocol.genesis.v1.rs | 12 +- .../astria.protocol.genesis.v1.serde.rs | 243 +++++++++--------- ...v1.rs => astria.protocol.price_feed.v1.rs} | 10 +- ...=> astria.protocol.price_feed.v1.serde.rs} | 12 +- .../astria.protocol.transaction.v1.rs | 6 +- .../src/generated/astria.sequencerblock.v1.rs | 10 +- .../astria.sequencerblock.v1.serde.rs | 174 ++++++------- .../src/generated/astria.upgrades.v1.rs | 12 +- .../src/generated/astria.upgrades.v1.serde.rs | 42 +-- crates/astria-core/src/generated/mod.rs | 26 +- ...nnect.abci.v2.rs => price_feed.abci.v2.rs} | 4 +- ...2.serde.rs => price_feed.abci.v2.serde.rs} | 6 +- ...etmap.v2.rs => price_feed.marketmap.v2.rs} | 82 +++--- ...de.rs => price_feed.marketmap.v2.serde.rs} | 84 +++--- ...t.oracle.v2.rs => price_feed.oracle.v2.rs} | 77 +++--- ...serde.rs => price_feed.oracle.v2.serde.rs} | 72 +++--- ...service.v2.rs => price_feed.service.v2.rs} | 44 ++-- ...erde.rs => price_feed.service.v2.serde.rs} | 36 +-- ...ect.types.v2.rs => price_feed.types.v2.rs} | 4 +- ....serde.rs => price_feed.types.v2.serde.rs} | 6 +- crates/astria-core/src/lib.rs | 2 +- crates/astria-core/src/oracles/mod.rs | 1 + .../{connect => oracles/price_feed}/abci.rs | 8 +- .../price_feed}/market_map.rs | 4 +- .../{connect => oracles/price_feed}/mod.rs | 0 .../{connect => oracles/price_feed}/oracle.rs | 4 +- .../price_feed}/service.rs | 4 +- .../{connect => oracles/price_feed}/types.rs | 2 +- .../{connect => oracles/price_feed}/utils.rs | 10 +- ...ol__genesis__v1__tests__genesis_state.snap | 2 +- crates/astria-core/src/protocol/genesis/v1.rs | 86 +++---- crates/astria-core/src/protocol/mod.rs | 2 +- .../protocol/{connect.rs => price_feed.rs} | 10 +- crates/astria-core/src/protocol/test_utils.rs | 14 +- .../src/protocol/transaction/v1/action/mod.rs | 2 +- .../src/sequencerblock/v1/block/mod.rs | 71 ++--- .../src/sequencerblock/v1/celestia.rs | 2 +- crates/astria-core/src/upgrades/test_utils.rs | 6 +- .../astria-core/src/upgrades/v1/upgrade1.rs | 70 ++--- .../astria-sequencer-utils/src/blob_parser.rs | 53 ++-- .../src/genesis_example.rs | 10 +- crates/astria-sequencer/local.env.example | 14 +- .../impls/add_currency_pairs.rs | 8 +- .../impls/remove_currency_pairs.rs | 6 +- .../src/app/benchmark_and_test_utils.rs | 4 +- crates/astria-sequencer/src/app/mod.rs | 12 +- ...breaking_changes__app_hash_at_genesis.snap | 62 ++--- ...hanges__app_hash_execute_every_action.snap | 62 ++--- ...king_changes__app_hash_finalize_block.snap | 60 ++--- crates/astria-sequencer/src/app/test_utils.rs | 2 +- .../src/app/tests_app/upgrades.rs | 10 +- .../src/app/tests_breaking_changes.rs | 2 +- .../src/app/tests_execute_transaction.rs | 4 +- .../src/app/vote_extension.rs | 34 +-- crates/astria-sequencer/src/config.rs | 12 +- ...torage__keys__tests__last_updated_key.snap | 5 - ..._storage__keys__tests__market_map_key.snap | 5 - ...map__storage__keys__tests__params_key.snap | 5 - ..._keys__tests__currency_pair_state_key.snap | 5 - ..._keys__tests__currency_pair_to_id_key.snap | 5 - ..._keys__tests__id_to_currency_pair_key.snap | 5 - ...eys__tests__next_currency_pair_id_key.snap | 5 - ...__keys__tests__num_currency_pairs_key.snap | 5 - ...tests__num_removed_currency_pairs_key.snap | 5 - crates/astria-sequencer/src/grpc/mod.rs | 2 +- .../src/grpc/{connect.rs => price_feed.rs} | 15 +- crates/astria-sequencer/src/lib.rs | 2 +- crates/astria-sequencer/src/oracles/mod.rs | 1 + .../price_feed}/market_map/component.rs | 6 +- .../price_feed}/market_map/mod.rs | 0 .../price_feed}/market_map/state_ext.rs | 4 +- .../price_feed}/market_map/storage/keys.rs | 10 +- .../price_feed}/market_map/storage/mod.rs | 0 ...torage__keys__tests__last_updated_key.snap | 5 + ..._storage__keys__tests__market_map_key.snap | 5 + ...map__storage__keys__tests__params_key.snap | 5 + .../market_map/storage/values/block_height.rs | 8 +- .../market_map/storage/values/market_map.rs | 13 +- .../market_map/storage/values/mod.rs | 2 +- .../market_map/storage/values/params.rs | 12 +- .../{connect => oracles/price_feed}/mod.rs | 0 .../price_feed}/oracle/component.rs | 6 +- .../oracle/currency_pair_strategy.rs | 4 +- .../price_feed}/oracle/mod.rs | 0 .../price_feed}/oracle/state_ext.rs | 4 +- .../price_feed}/oracle/storage/keys.rs | 37 +-- .../price_feed}/oracle/storage/mod.rs | 0 ..._keys__tests__currency_pair_state_key.snap | 5 + ..._keys__tests__currency_pair_to_id_key.snap | 5 + ..._keys__tests__id_to_currency_pair_key.snap | 5 + ...eys__tests__next_currency_pair_id_key.snap | 5 + ...__keys__tests__num_currency_pairs_key.snap | 5 + .../oracle/storage/values/count.rs | 8 +- .../oracle/storage/values/currency_pair.rs | 10 +- .../oracle/storage/values/currency_pair_id.rs | 10 +- .../storage/values/currency_pair_state.rs | 15 +- .../price_feed}/oracle/storage/values/mod.rs | 2 +- crates/astria-sequencer/src/sequencer.rs | 104 ++++---- .../src/storage/stored_value.rs | 4 +- dev/values/validators/all-without-native.yml | 2 +- dev/values/validators/all.yml | 2 +- .../astria/protocol/genesis/v1/types.proto | 12 +- .../v1/transaction.proto | 6 +- .../protocol/transaction/v1/action.proto | 8 +- .../astria/sequencerblock/v1/block.proto | 8 +- .../astria/upgrades/v1/upgrades.proto | 8 +- .../abci/v2/vote_extensions.proto | 2 +- .../marketmap/v2/genesis.proto | 6 +- .../marketmap/v2/market.proto | 8 +- .../marketmap/v2/params.proto | 2 +- .../marketmap/v2/query.proto | 18 +- .../oracle/v2/genesis.proto | 6 +- .../oracle/v2/query.proto | 18 +- .../service/v2/oracle.proto | 12 +- .../types/v2/currency_pair.proto | 2 +- tools/protobuf-compiler/src/main.rs | 10 +- 128 files changed, 1118 insertions(+), 1092 deletions(-) rename crates/astria-core/src/generated/{astria.protocol.connect.v1.rs => astria.protocol.price_feed.v1.rs} (75%) rename crates/astria-core/src/generated/{astria.protocol.connect.v1.serde.rs => astria.protocol.price_feed.v1.serde.rs} (94%) rename crates/astria-core/src/generated/{connect.abci.v2.rs => price_feed.abci.v2.rs} (85%) rename crates/astria-core/src/generated/{connect.abci.v2.serde.rs => price_feed.abci.v2.serde.rs} (92%) rename crates/astria-core/src/generated/{connect.marketmap.v2.rs => price_feed.marketmap.v2.rs} (92%) rename crates/astria-core/src/generated/{connect.marketmap.v2.serde.rs => price_feed.marketmap.v2.serde.rs} (92%) rename crates/astria-core/src/generated/{connect.oracle.v2.rs => price_feed.oracle.v2.rs} (92%) rename crates/astria-core/src/generated/{connect.oracle.v2.serde.rs => price_feed.oracle.v2.serde.rs} (92%) rename crates/astria-core/src/generated/{connect.service.v2.rs => price_feed.service.v2.rs} (93%) rename crates/astria-core/src/generated/{connect.service.v2.serde.rs => price_feed.service.v2.serde.rs} (90%) rename crates/astria-core/src/generated/{connect.types.v2.rs => price_feed.types.v2.rs} (81%) rename crates/astria-core/src/generated/{connect.types.v2.serde.rs => price_feed.types.v2.serde.rs} (93%) create mode 100644 crates/astria-core/src/oracles/mod.rs rename crates/astria-core/src/{connect => oracles/price_feed}/abci.rs (89%) rename crates/astria-core/src/{connect => oracles/price_feed}/market_map.rs (99%) rename crates/astria-core/src/{connect => oracles/price_feed}/mod.rs (100%) rename crates/astria-core/src/{connect => oracles/price_feed}/oracle.rs (99%) rename crates/astria-core/src/{connect => oracles/price_feed}/service.rs (96%) rename crates/astria-core/src/{connect => oracles/price_feed}/types.rs (99%) rename crates/astria-core/src/{connect => oracles/price_feed}/utils.rs (96%) rename crates/astria-core/src/protocol/{connect.rs => price_feed.rs} (98%) delete mode 100644 crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__last_updated_key.snap delete mode 100644 crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__market_map_key.snap delete mode 100644 crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__params_key.snap delete mode 100644 crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__currency_pair_state_key.snap delete mode 100644 crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__currency_pair_to_id_key.snap delete mode 100644 crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__id_to_currency_pair_key.snap delete mode 100644 crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__next_currency_pair_id_key.snap delete mode 100644 crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__num_currency_pairs_key.snap delete mode 100644 crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__num_removed_currency_pairs_key.snap rename crates/astria-sequencer/src/grpc/{connect.rs => price_feed.rs} (94%) create mode 100644 crates/astria-sequencer/src/oracles/mod.rs rename crates/astria-sequencer/src/{connect => oracles/price_feed}/market_map/component.rs (90%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/market_map/mod.rs (100%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/market_map/state_ext.rs (99%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/market_map/storage/keys.rs (57%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/market_map/storage/mod.rs (100%) create mode 100644 crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__last_updated_key.snap create mode 100644 crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__market_map_key.snap create mode 100644 crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__params_key.snap rename crates/astria-sequencer/src/{connect => oracles/price_feed}/market_map/storage/values/block_height.rs (71%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/market_map/storage/values/market_map.rs (92%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/market_map/storage/values/mod.rs (88%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/market_map/storage/values/params.rs (85%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/mod.rs (100%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/component.rs (93%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/currency_pair_strategy.rs (91%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/mod.rs (100%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/state_ext.rs (99%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/storage/keys.rs (71%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/storage/mod.rs (100%) create mode 100644 crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__currency_pair_state_key.snap create mode 100644 crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__currency_pair_to_id_key.snap create mode 100644 crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__id_to_currency_pair_key.snap create mode 100644 crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__next_currency_pair_id_key.snap create mode 100644 crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__num_currency_pairs_key.snap rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/storage/values/count.rs (67%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/storage/values/currency_pair.rs (77%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/storage/values/currency_pair_id.rs (67%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/storage/values/currency_pair_state.rs (86%) rename crates/astria-sequencer/src/{connect => oracles/price_feed}/oracle/storage/values/mod.rs (91%) rename proto/protocolapis/astria/protocol/{connect => price_feed}/v1/transaction.proto (70%) rename proto/vendored/{connect => price_feed}/abci/v2/vote_extensions.proto (94%) rename proto/vendored/{connect => price_feed}/marketmap/v2/genesis.proto (82%) rename proto/vendored/{connect => price_feed}/marketmap/v2/market.proto (92%) rename proto/vendored/{connect => price_feed}/marketmap/v2/params.proto (93%) rename proto/vendored/{connect => price_feed}/marketmap/v2/query.proto (81%) rename proto/vendored/{connect => price_feed}/oracle/v2/genesis.proto (94%) rename proto/vendored/{connect => price_feed}/oracle/v2/query.proto (83%) rename proto/vendored/{connect => price_feed}/service/v2/oracle.proto (83%) rename proto/vendored/{connect => price_feed}/types/v2/currency_pair.proto (90%) diff --git a/charts/sequencer/Chart.yaml b/charts/sequencer/Chart.yaml index 5107f393d6..58cf56878c 100644 --- a/charts/sequencer/Chart.yaml +++ b/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. diff --git a/charts/sequencer/files/cometbft/config/genesis.json b/charts/sequencer/files/cometbft/config/genesis.json index 3c2484e90d..ae43f4d4e4 100644 --- a/charts/sequencer/files/cometbft/config/genesis.json +++ b/charts/sequencer/files/cometbft/config/genesis.json @@ -122,11 +122,11 @@ ], {{- if not .Values.global.dev }} {{- else }} - "connect": { + "price_feed": { "marketMap": { "marketMap": { "markets": { - {{- range $index, $market := .Values.sequencer.oracle.markets }} + {{- range $index, $market := .Values.sequencer.priceFeed.markets }} {{- if $index }},{{- end }} "{{ $market.name }}": { "providerConfigs": [ @@ -158,9 +158,9 @@ } }, "params": { - "admin": "{{ .Values.genesis.oracle.marketAdminAddress }}", + "admin": "{{ .Values.genesis.priceFeed.marketAdminAddress }}", "marketAuthorities": [ - {{- range $index, $authority := .Values.genesis.oracle.marketAuthorities }} + {{- range $index, $authority := .Values.genesis.priceFeed.marketAuthorities }} {{- if $index }},{{- end }} "{{ $authority }}" {{- end }} @@ -169,7 +169,7 @@ }, "oracle": { "currencyPairGenesis": [ - {{- range $index, $genesis := .Values.sequencer.oracle.currencyPairGenesis }} + {{- range $index, $genesis := .Values.sequencer.priceFeed.currencyPairGenesis }} {{- if $index }},{{- end }} { "currencyPair": { @@ -186,7 +186,7 @@ } {{- end }} ], - "nextId": "{{ .Values.sequencer.oracle.nextId }}" + "nextId": "{{ .Values.sequencer.priceFeed.nextId }}" } } }, diff --git a/charts/sequencer/templates/_helpers.tpl b/charts/sequencer/templates/_helpers.tpl index fc2e7dd23e..ab8409d22d 100644 --- a/charts/sequencer/templates/_helpers.tpl +++ b/charts/sequencer/templates/_helpers.tpl @@ -11,8 +11,8 @@ 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 }} +{{- define "priceFeed.image" -}} +{{ .Values.images.priceFeed.repo }}:{{ if .Values.global.dev }}{{ .Values.images.priceFeed.devTag }}{{ else }}{{ .Values.images.priceFeed.tag }}{{ end }} {{- end }} {{/* diff --git a/charts/sequencer/templates/configmaps.yaml b/charts/sequencer/templates/configmaps.yaml index 15ad89a3d4..a7e191a72e 100644 --- a/charts/sequencer/templates/configmaps.yaml +++ b/charts/sequencer/templates/configmaps.yaml @@ -91,8 +91,8 @@ data: {{- else }} ASTRIA_SEQUENCER_UPGRADES_FILEPATH: "/sequencer-upgrades/upgrades.json" ASTRIA_SEQUENCER_COMETBFT_RPC_ADDR: "http://127.0.0.1:{{ .Values.ports.cometbftRpc }}" - 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 }}" + ASTRIA_SEQUENCER_NO_PRICE_FEED: "{{ not .Values.sequencer.priceFeed.enabled }}" + ASTRIA_SEQUENCER_PRICE_FEED_GRPC_ADDR: "http://127.0.0.1:{{ .Values.ports.priceFeedGrpc }}" + ASTRIA_SEQUENCER_PRICE_FEED_CLIENT_TIMEOUT_MILLISECONDS: "{{ .Values.sequencer.priceFeed.clientTimeout }}" {{- end }} --- diff --git a/charts/sequencer/templates/service.yaml b/charts/sequencer/templates/service.yaml index 33c3fe3514..9b75599de9 100644 --- a/charts/sequencer/templates/service.yaml +++ b/charts/sequencer/templates/service.yaml @@ -47,7 +47,7 @@ spec: port: {{ .Values.ports.sequencerGrpc }} targetPort: sequencer-grpc --- -{{- if .Values.serviceMonitor.enabled }} +{{- if .Values.serviceMonitor.enabled }} kind: Service apiVersion: v1 metadata: @@ -66,10 +66,10 @@ spec: - name: seq-metric port: {{ .Values.ports.sequencerMetrics }} targetPort: seq-metric - {{- if .Values.sequencer.oracle.metrics.enabled }} - - name: oracle-metric - port: {{ .Values.ports.oracleMetrics }} - targetPort: oracle-metric + {{- if .Values.sequencer.priceFeed.metrics.enabled }} + - name: price-fd-metric + port: {{ .Values.ports.priceFeedMetrics }} + targetPort: price-fd-metric {{- end }} {{- end }} {{- end }} diff --git a/charts/sequencer/templates/servicemonitor.yaml b/charts/sequencer/templates/servicemonitor.yaml index 886ca30ffc..ac6ca4675e 100644 --- a/charts/sequencer/templates/servicemonitor.yaml +++ b/charts/sequencer/templates/servicemonitor.yaml @@ -34,8 +34,8 @@ spec: {{- with .Values.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ . }} {{- end }} - {{- if .Values.sequencer.oracle.metrics.enabled }} - - port: oracle-metric + {{- if .Values.sequencer.priceFeed.metrics.enabled }} + - port: price-fd-metric path: / {{- with .Values.serviceMonitor.interval }} interval: {{ . }} diff --git a/charts/sequencer/templates/statefulsets.yaml b/charts/sequencer/templates/statefulsets.yaml index 232b1104c4..5999a2977d 100644 --- a/charts/sequencer/templates/statefulsets.yaml +++ b/charts/sequencer/templates/statefulsets.yaml @@ -96,9 +96,9 @@ spec: limits: cpu: {{ .Values.resources.cometbft.limits.cpu }} memory: {{ .Values.resources.cometbft.limits.memory }} - - name: connect - image: "{{ include "connect.image" . }}" - imagePullPolicy: {{ .Values.images.connect.pullPolicy }} + - name: price-feed + image: "{{ include "priceFeed.image" . }}" + imagePullPolicy: {{ .Values.images.priceFeed.pullPolicy }} volumeMounts: - mountPath: /scripts name: cometbft-init-scripts-volume @@ -107,12 +107,12 @@ spec: - "--market-map-endpoint" - "127.0.0.1:{{ .Values.ports.sequencerGrpc }}" - "--port" - - "{{ .Values.ports.oracleGrpc }}" + - "{{ .Values.ports.priceFeedGrpc }}" ports: - - containerPort: {{ .Values.ports.oracleGrpc }} - name: oracle-grpc - - containerPort: {{ .Values.ports.oracleMetrics }} - name: oracle-metric + - containerPort: {{ .Values.ports.priceFeedGrpc }} + name: price-feed-grpc + - containerPort: {{ .Values.ports.priceFeedMetrics }} + name: price-fd-metric volumes: - name: cometbft-config-volume configMap: diff --git a/charts/sequencer/values.yaml b/charts/sequencer/values.yaml index d54ec479ab..e6edf8d88a 100644 --- a/charts/sequencer/values.yaml +++ b/charts/sequencer/values.yaml @@ -25,7 +25,7 @@ images: pullPolicy: IfNotPresent tag: 1.0.0 devTag: sha-80be7eb - connect: + priceFeed: repo: ghcr.io/skip-mev/connect-sidecar pullPolicy: IfNotPresent tag: v2 @@ -39,7 +39,7 @@ genesis: base: "astria" ibcCompat: "astriacompat" authoritySudoAddress: "" - oracle: + priceFeed: marketAdminAddress: "astria1rsxyjrcm255ds9euthjx6yc3vrjt9sxrm9cfgm" marketAuthorities: - "astria1rsxyjrcm255ds9euthjx6yc3vrjt9sxrm9cfgm" @@ -120,7 +120,7 @@ sequencer: mempool: parked: maxTxCount: 200 - oracle: + priceFeed: enabled: true clientTimeout: 1000 markets: [] @@ -289,12 +289,12 @@ ports: cometbftRpc: 26657 cometbftMetrics: 26660 sequencerABCI: 26658 - # note: the oracle sidecar also uses 8080 by default but can be changed with --port + # note: the price feed sidecar also uses 8080 by default but can be changed with --port sequencerGrpc: 8080 relayerRpc: 2450 sequencerMetrics: 9000 - oracleGrpc: 8081 - oracleMetrics: 8002 + priceFeedGrpc: 8081 + priceFeedMetrics: 8002 # ServiceMonitor configuration serviceMonitor: diff --git a/crates/astria-conductor/src/celestia/block_verifier.rs b/crates/astria-conductor/src/celestia/block_verifier.rs index 565ff70d3b..4ad324ab4e 100644 --- a/crates/astria-conductor/src/celestia/block_verifier.rs +++ b/crates/astria-conductor/src/celestia/block_verifier.rs @@ -322,7 +322,7 @@ mod tests { } fn make_test_extended_commit_info_bytes() -> Vec { - use astria_core::generated::protocol::connect::v1::ExtendedCommitInfoWithCurrencyPairMapping; + use astria_core::generated::protocol::price_feed::v1::ExtendedCommitInfoWithCurrencyPairMapping; let extended_commit_info: tendermint_proto::abci::ExtendedCommitInfo = tendermint::abci::types::ExtendedCommitInfo { diff --git a/crates/astria-conductor/src/celestia/mod.rs b/crates/astria-conductor/src/celestia/mod.rs index a16161f861..70493742e5 100644 --- a/crates/astria-conductor/src/celestia/mod.rs +++ b/crates/astria-conductor/src/celestia/mod.rs @@ -6,7 +6,7 @@ use std::{ use astria_core::{ primitive::v1::RollupId, - protocol::connect::v1::ExtendedCommitInfoWithCurrencyPairMapping, + protocol::price_feed::v1::ExtendedCommitInfoWithCurrencyPairMapping, sequencerblock::v1::block::SequencerBlockHeader, }; use astria_eyre::eyre::{ diff --git a/crates/astria-conductor/src/executor/mod.rs b/crates/astria-conductor/src/executor/mod.rs index 9ca41d9d91..228d71f616 100644 --- a/crates/astria-conductor/src/executor/mod.rs +++ b/crates/astria-conductor/src/executor/mod.rs @@ -6,11 +6,11 @@ use astria_core::{ CommitmentState, }, primitive::v1::RollupId, - protocol::connect::v1::ExtendedCommitInfoWithCurrencyPairMapping, + protocol::price_feed::v1::ExtendedCommitInfoWithCurrencyPairMapping, sequencerblock::v1::block::{ FilteredSequencerBlock, FilteredSequencerBlockParts, - OracleData, + PriceFeedData, RollupData, }, }; @@ -710,7 +710,7 @@ impl ExecutableBlock { } = block; let timestamp = convert_tendermint_time_to_protobuf_timestamp(header.time()); let transactions = - insert_oracle_data_into_transactions_if_exists(transactions, extended_commit_info); + insert_price_feed_data_into_transactions_if_exists(transactions, extended_commit_info); Self { hash: block_hash, height: header.height(), @@ -735,7 +735,7 @@ impl ExecutableBlock { .unwrap_or_default(); let transactions = - insert_oracle_data_into_transactions_if_exists(transactions, extended_commit_info); + insert_price_feed_data_into_transactions_if_exists(transactions, extended_commit_info); Self { hash: block_hash, height, @@ -745,23 +745,26 @@ impl ExecutableBlock { } } -fn insert_oracle_data_into_transactions_if_exists( +fn insert_price_feed_data_into_transactions_if_exists( transactions: Vec, extended_commit_info: Option, ) -> Vec { use prost::Message as _; if let Some(extended_commit_info) = extended_commit_info { - let Ok(prices) = astria_core::connect::utils::calculate_prices_from_vote_extensions( - &extended_commit_info.extended_commit_info, - &extended_commit_info.id_to_currency_pair, - ) else { + let Ok(prices) = + astria_core::oracles::price_feed::utils::calculate_prices_from_vote_extensions( + &extended_commit_info.extended_commit_info, + &extended_commit_info.id_to_currency_pair, + ) + else { debug!( - "failed to calculate prices from vote extensions; continuing without oracle data" + "failed to calculate prices from vote extensions; continuing without price feed \ + data" ); return transactions; }; - let rollup_data = RollupData::OracleData(Box::new(OracleData::new(prices))); + let rollup_data = RollupData::PriceFeedData(Box::new(PriceFeedData::new(prices))); std::iter::once(rollup_data.into_raw().encode_to_vec().into()) .chain(transactions) .collect() diff --git a/crates/astria-conductor/tests/blackbox/helpers/macros.rs b/crates/astria-conductor/tests/blackbox/helpers/macros.rs index 626f3b7e44..df05b68ca4 100644 --- a/crates/astria-conductor/tests/blackbox/helpers/macros.rs +++ b/crates/astria-conductor/tests/blackbox/helpers/macros.rs @@ -282,7 +282,7 @@ macro_rules! mount_executed_block { ::serde_json::json!({ "prevBlockHash": BASE64_STANDARD.encode($parent), "transactions": [ - {"oracleData": {}}, + {"priceFeedData": {}}, {"sequencedData": BASE64_STANDARD.encode($crate::helpers::data())} ], }), @@ -414,7 +414,7 @@ macro_rules! mount_execute_block_tonic_code { ::serde_json::json!({ "prevBlockHash": BASE64_STANDARD.encode($parent), "transactions": [ - {"oracleData": {}}, + {"priceFeedData": {}}, {"sequencedData": BASE64_STANDARD.encode($crate::helpers::data())} ], }), diff --git a/crates/astria-core/src/generated/astria.protocol.genesis.v1.rs b/crates/astria-core/src/generated/astria.protocol.genesis.v1.rs index 93d8b795d0..31ba7ca5d9 100644 --- a/crates/astria-core/src/generated/astria.protocol.genesis.v1.rs +++ b/crates/astria-core/src/generated/astria.protocol.genesis.v1.rs @@ -28,7 +28,7 @@ pub struct GenesisAppState { #[prost(message, optional, tag = "10")] pub fees: ::core::option::Option, #[prost(message, optional, tag = "11")] - pub connect: ::core::option::Option, + pub price_feed: ::core::option::Option, } impl ::prost::Name for GenesisAppState { const NAME: &'static str = "GenesisAppState"; @@ -165,18 +165,18 @@ impl ::prost::Name for GenesisFees { } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct ConnectGenesis { +pub struct PriceFeedGenesis { #[prost(message, optional, tag = "1")] pub market_map: ::core::option::Option< - super::super::super::super::connect::marketmap::v2::GenesisState, + super::super::super::super::price_feed::marketmap::v2::GenesisState, >, #[prost(message, optional, tag = "2")] pub oracle: ::core::option::Option< - super::super::super::super::connect::oracle::v2::GenesisState, + super::super::super::super::price_feed::oracle::v2::GenesisState, >, } -impl ::prost::Name for ConnectGenesis { - const NAME: &'static str = "ConnectGenesis"; +impl ::prost::Name for PriceFeedGenesis { + const NAME: &'static str = "PriceFeedGenesis"; const PACKAGE: &'static str = "astria.protocol.genesis.v1"; fn full_name() -> ::prost::alloc::string::String { ::prost::alloc::format!("astria.protocol.genesis.v1.{}", Self::NAME) diff --git a/crates/astria-core/src/generated/astria.protocol.genesis.v1.serde.rs b/crates/astria-core/src/generated/astria.protocol.genesis.v1.serde.rs index acfcfa6c8a..f90f577de9 100644 --- a/crates/astria-core/src/generated/astria.protocol.genesis.v1.serde.rs +++ b/crates/astria-core/src/generated/astria.protocol.genesis.v1.serde.rs @@ -215,115 +215,6 @@ impl<'de> serde::Deserialize<'de> for AddressPrefixes { deserializer.deserialize_struct("astria.protocol.genesis.v1.AddressPrefixes", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for ConnectGenesis { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if self.market_map.is_some() { - len += 1; - } - if self.oracle.is_some() { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("astria.protocol.genesis.v1.ConnectGenesis", len)?; - if let Some(v) = self.market_map.as_ref() { - struct_ser.serialize_field("marketMap", v)?; - } - if let Some(v) = self.oracle.as_ref() { - struct_ser.serialize_field("oracle", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for ConnectGenesis { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "market_map", - "marketMap", - "oracle", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - MarketMap, - Oracle, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "marketMap" | "market_map" => Ok(GeneratedField::MarketMap), - "oracle" => Ok(GeneratedField::Oracle), - _ => Err(serde::de::Error::unknown_field(value, FIELDS)), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = ConnectGenesis; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct astria.protocol.genesis.v1.ConnectGenesis") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut market_map__ = None; - let mut oracle__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::MarketMap => { - if market_map__.is_some() { - return Err(serde::de::Error::duplicate_field("marketMap")); - } - market_map__ = map_.next_value()?; - } - GeneratedField::Oracle => { - if oracle__.is_some() { - return Err(serde::de::Error::duplicate_field("oracle")); - } - oracle__ = map_.next_value()?; - } - } - } - Ok(ConnectGenesis { - market_map: market_map__, - oracle: oracle__, - }) - } - } - deserializer.deserialize_struct("astria.protocol.genesis.v1.ConnectGenesis", FIELDS, GeneratedVisitor) - } -} impl serde::Serialize for GenesisAppState { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -362,7 +253,7 @@ impl serde::Serialize for GenesisAppState { if self.fees.is_some() { len += 1; } - if self.connect.is_some() { + if self.price_feed.is_some() { len += 1; } let mut struct_ser = serializer.serialize_struct("astria.protocol.genesis.v1.GenesisAppState", len)?; @@ -396,8 +287,8 @@ impl serde::Serialize for GenesisAppState { if let Some(v) = self.fees.as_ref() { struct_ser.serialize_field("fees", v)?; } - if let Some(v) = self.connect.as_ref() { - struct_ser.serialize_field("connect", v)?; + if let Some(v) = self.price_feed.as_ref() { + struct_ser.serialize_field("priceFeed", v)?; } struct_ser.end() } @@ -427,7 +318,8 @@ impl<'de> serde::Deserialize<'de> for GenesisAppState { "allowed_fee_assets", "allowedFeeAssets", "fees", - "connect", + "price_feed", + "priceFeed", ]; #[allow(clippy::enum_variant_names)] @@ -442,7 +334,7 @@ impl<'de> serde::Deserialize<'de> for GenesisAppState { IbcParameters, AllowedFeeAssets, Fees, - Connect, + PriceFeed, } impl<'de> serde::Deserialize<'de> for GeneratedField { fn deserialize(deserializer: D) -> std::result::Result @@ -474,7 +366,7 @@ impl<'de> serde::Deserialize<'de> for GenesisAppState { "ibcParameters" | "ibc_parameters" => Ok(GeneratedField::IbcParameters), "allowedFeeAssets" | "allowed_fee_assets" => Ok(GeneratedField::AllowedFeeAssets), "fees" => Ok(GeneratedField::Fees), - "connect" => Ok(GeneratedField::Connect), + "priceFeed" | "price_feed" => Ok(GeneratedField::PriceFeed), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -504,7 +396,7 @@ impl<'de> serde::Deserialize<'de> for GenesisAppState { let mut ibc_parameters__ = None; let mut allowed_fee_assets__ = None; let mut fees__ = None; - let mut connect__ = None; + let mut price_feed__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::ChainId => { @@ -567,11 +459,11 @@ impl<'de> serde::Deserialize<'de> for GenesisAppState { } fees__ = map_.next_value()?; } - GeneratedField::Connect => { - if connect__.is_some() { - return Err(serde::de::Error::duplicate_field("connect")); + GeneratedField::PriceFeed => { + if price_feed__.is_some() { + return Err(serde::de::Error::duplicate_field("priceFeed")); } - connect__ = map_.next_value()?; + price_feed__ = map_.next_value()?; } } } @@ -586,7 +478,7 @@ impl<'de> serde::Deserialize<'de> for GenesisAppState { ibc_parameters: ibc_parameters__, allowed_fee_assets: allowed_fee_assets__.unwrap_or_default(), fees: fees__, - connect: connect__, + price_feed: price_feed__, }) } } @@ -1082,3 +974,112 @@ impl<'de> serde::Deserialize<'de> for IbcParameters { deserializer.deserialize_struct("astria.protocol.genesis.v1.IbcParameters", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for PriceFeedGenesis { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.market_map.is_some() { + len += 1; + } + if self.oracle.is_some() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("astria.protocol.genesis.v1.PriceFeedGenesis", len)?; + if let Some(v) = self.market_map.as_ref() { + struct_ser.serialize_field("marketMap", v)?; + } + if let Some(v) = self.oracle.as_ref() { + struct_ser.serialize_field("oracle", v)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for PriceFeedGenesis { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "market_map", + "marketMap", + "oracle", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + MarketMap, + Oracle, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "marketMap" | "market_map" => Ok(GeneratedField::MarketMap), + "oracle" => Ok(GeneratedField::Oracle), + _ => Err(serde::de::Error::unknown_field(value, FIELDS)), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = PriceFeedGenesis; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct astria.protocol.genesis.v1.PriceFeedGenesis") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut market_map__ = None; + let mut oracle__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::MarketMap => { + if market_map__.is_some() { + return Err(serde::de::Error::duplicate_field("marketMap")); + } + market_map__ = map_.next_value()?; + } + GeneratedField::Oracle => { + if oracle__.is_some() { + return Err(serde::de::Error::duplicate_field("oracle")); + } + oracle__ = map_.next_value()?; + } + } + } + Ok(PriceFeedGenesis { + market_map: market_map__, + oracle: oracle__, + }) + } + } + deserializer.deserialize_struct("astria.protocol.genesis.v1.PriceFeedGenesis", FIELDS, GeneratedVisitor) + } +} diff --git a/crates/astria-core/src/generated/astria.protocol.connect.v1.rs b/crates/astria-core/src/generated/astria.protocol.price_feed.v1.rs similarity index 75% rename from crates/astria-core/src/generated/astria.protocol.connect.v1.rs rename to crates/astria-core/src/generated/astria.protocol.price_feed.v1.rs index f40345e781..79dfee8abe 100644 --- a/crates/astria-core/src/generated/astria.protocol.connect.v1.rs +++ b/crates/astria-core/src/generated/astria.protocol.price_feed.v1.rs @@ -10,9 +10,9 @@ pub struct ExtendedCommitInfoWithCurrencyPairMapping { } impl ::prost::Name for ExtendedCommitInfoWithCurrencyPairMapping { const NAME: &'static str = "ExtendedCommitInfoWithCurrencyPairMapping"; - const PACKAGE: &'static str = "astria.protocol.connect.v1"; + const PACKAGE: &'static str = "astria.protocol.price_feed.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("astria.protocol.connect.v1.{}", Self::NAME) + ::prost::alloc::format!("astria.protocol.price_feed.v1.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -22,15 +22,15 @@ pub struct IdWithCurrencyPair { pub id: u64, #[prost(message, optional, tag = "2")] pub currency_pair: ::core::option::Option< - super::super::super::super::connect::types::v2::CurrencyPair, + super::super::super::super::price_feed::types::v2::CurrencyPair, >, #[prost(uint64, tag = "3")] pub decimals: u64, } impl ::prost::Name for IdWithCurrencyPair { const NAME: &'static str = "IdWithCurrencyPair"; - const PACKAGE: &'static str = "astria.protocol.connect.v1"; + const PACKAGE: &'static str = "astria.protocol.price_feed.v1"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("astria.protocol.connect.v1.{}", Self::NAME) + ::prost::alloc::format!("astria.protocol.price_feed.v1.{}", Self::NAME) } } diff --git a/crates/astria-core/src/generated/astria.protocol.connect.v1.serde.rs b/crates/astria-core/src/generated/astria.protocol.price_feed.v1.serde.rs similarity index 94% rename from crates/astria-core/src/generated/astria.protocol.connect.v1.serde.rs rename to crates/astria-core/src/generated/astria.protocol.price_feed.v1.serde.rs index 062d538484..6066a19e90 100644 --- a/crates/astria-core/src/generated/astria.protocol.connect.v1.serde.rs +++ b/crates/astria-core/src/generated/astria.protocol.price_feed.v1.serde.rs @@ -12,7 +12,7 @@ impl serde::Serialize for ExtendedCommitInfoWithCurrencyPairMapping { if !self.id_to_currency_pair.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("astria.protocol.connect.v1.ExtendedCommitInfoWithCurrencyPairMapping", len)?; + let mut struct_ser = serializer.serialize_struct("astria.protocol.price_feed.v1.ExtendedCommitInfoWithCurrencyPairMapping", len)?; if let Some(v) = self.extended_commit_info.as_ref() { struct_ser.serialize_field("extendedCommitInfo", v)?; } @@ -74,7 +74,7 @@ impl<'de> serde::Deserialize<'de> for ExtendedCommitInfoWithCurrencyPairMapping type Value = ExtendedCommitInfoWithCurrencyPairMapping; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct astria.protocol.connect.v1.ExtendedCommitInfoWithCurrencyPairMapping") + formatter.write_str("struct astria.protocol.price_feed.v1.ExtendedCommitInfoWithCurrencyPairMapping") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -105,7 +105,7 @@ impl<'de> serde::Deserialize<'de> for ExtendedCommitInfoWithCurrencyPairMapping }) } } - deserializer.deserialize_struct("astria.protocol.connect.v1.ExtendedCommitInfoWithCurrencyPairMapping", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("astria.protocol.price_feed.v1.ExtendedCommitInfoWithCurrencyPairMapping", FIELDS, GeneratedVisitor) } } impl serde::Serialize for IdWithCurrencyPair { @@ -125,7 +125,7 @@ impl serde::Serialize for IdWithCurrencyPair { if self.decimals != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("astria.protocol.connect.v1.IdWithCurrencyPair", len)?; + let mut struct_ser = serializer.serialize_struct("astria.protocol.price_feed.v1.IdWithCurrencyPair", len)?; if self.id != 0 { #[allow(clippy::needless_borrow)] struct_ser.serialize_field("id", ToString::to_string(&self.id).as_str())?; @@ -194,7 +194,7 @@ impl<'de> serde::Deserialize<'de> for IdWithCurrencyPair { type Value = IdWithCurrencyPair; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct astria.protocol.connect.v1.IdWithCurrencyPair") + formatter.write_str("struct astria.protocol.price_feed.v1.IdWithCurrencyPair") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -237,6 +237,6 @@ impl<'de> serde::Deserialize<'de> for IdWithCurrencyPair { }) } } - deserializer.deserialize_struct("astria.protocol.connect.v1.IdWithCurrencyPair", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("astria.protocol.price_feed.v1.IdWithCurrencyPair", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs b/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs index 27d3782a5c..6b01a57da4 100644 --- a/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs +++ b/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs @@ -46,7 +46,7 @@ pub mod action { FeeChange(super::FeeChange), #[prost(message, tag = "56")] IbcSudoChange(super::IbcSudoChange), - /// Oracle actions are defined on 71-80 + /// Price feed actions are defined on 71-80 #[prost(message, tag = "71")] AddCurrencyPairs(super::AddCurrencyPairs), #[prost(message, tag = "72")] @@ -480,7 +480,7 @@ impl ::prost::Name for IbcSudoChange { pub struct AddCurrencyPairs { #[prost(message, repeated, tag = "1")] pub pairs: ::prost::alloc::vec::Vec< - super::super::super::super::connect::types::v2::CurrencyPair, + super::super::super::super::price_feed::types::v2::CurrencyPair, >, } impl ::prost::Name for AddCurrencyPairs { @@ -495,7 +495,7 @@ impl ::prost::Name for AddCurrencyPairs { pub struct RemoveCurrencyPairs { #[prost(message, repeated, tag = "1")] pub pairs: ::prost::alloc::vec::Vec< - super::super::super::super::connect::types::v2::CurrencyPair, + super::super::super::super::price_feed::types::v2::CurrencyPair, >, } impl ::prost::Name for RemoveCurrencyPairs { diff --git a/crates/astria-core/src/generated/astria.sequencerblock.v1.rs b/crates/astria-core/src/generated/astria.sequencerblock.v1.rs index 5031fd41ea..285a326a1d 100644 --- a/crates/astria-core/src/generated/astria.sequencerblock.v1.rs +++ b/crates/astria-core/src/generated/astria.sequencerblock.v1.rs @@ -236,7 +236,7 @@ pub mod rollup_data { #[prost(message, tag = "2")] Deposit(super::Deposit), #[prost(message, tag = "3")] - OracleData(super::OracleData), + PriceFeedData(super::PriceFeedData), } } impl ::prost::Name for RollupData { @@ -286,12 +286,12 @@ impl ::prost::Name for ExtendedCommitInfoWithProof { } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] -pub struct OracleData { +pub struct PriceFeedData { #[prost(message, repeated, tag = "1")] pub prices: ::prost::alloc::vec::Vec, } -impl ::prost::Name for OracleData { - const NAME: &'static str = "OracleData"; +impl ::prost::Name for PriceFeedData { + const NAME: &'static str = "PriceFeedData"; const PACKAGE: &'static str = "astria.sequencerblock.v1"; fn full_name() -> ::prost::alloc::string::String { ::prost::alloc::format!("astria.sequencerblock.v1.{}", Self::NAME) @@ -302,7 +302,7 @@ impl ::prost::Name for OracleData { pub struct Price { #[prost(message, optional, tag = "1")] pub currency_pair: ::core::option::Option< - super::super::super::connect::types::v2::CurrencyPair, + super::super::super::price_feed::types::v2::CurrencyPair, >, #[prost(message, optional, tag = "2")] pub price: ::core::option::Option, diff --git a/crates/astria-core/src/generated/astria.sequencerblock.v1.serde.rs b/crates/astria-core/src/generated/astria.sequencerblock.v1.serde.rs index 24ffe6e3c6..930c03b4a9 100644 --- a/crates/astria-core/src/generated/astria.sequencerblock.v1.serde.rs +++ b/crates/astria-core/src/generated/astria.sequencerblock.v1.serde.rs @@ -1100,7 +1100,7 @@ impl<'de> serde::Deserialize<'de> for GetUpgradesInfoResponse { deserializer.deserialize_struct("astria.sequencerblock.v1.GetUpgradesInfoResponse", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for OracleData { +impl serde::Serialize for Price { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -1108,29 +1108,47 @@ impl serde::Serialize for OracleData { { use serde::ser::SerializeStruct; let mut len = 0; - if !self.prices.is_empty() { + if self.currency_pair.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("astria.sequencerblock.v1.OracleData", len)?; - if !self.prices.is_empty() { - struct_ser.serialize_field("prices", &self.prices)?; + if self.price.is_some() { + len += 1; + } + if self.decimals != 0 { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("astria.sequencerblock.v1.Price", len)?; + if let Some(v) = self.currency_pair.as_ref() { + struct_ser.serialize_field("currencyPair", v)?; + } + if let Some(v) = self.price.as_ref() { + struct_ser.serialize_field("price", v)?; + } + if self.decimals != 0 { + #[allow(clippy::needless_borrow)] + struct_ser.serialize_field("decimals", ToString::to_string(&self.decimals).as_str())?; } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for OracleData { +impl<'de> serde::Deserialize<'de> for Price { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where D: serde::Deserializer<'de>, { const FIELDS: &[&str] = &[ - "prices", + "currency_pair", + "currencyPair", + "price", + "decimals", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { - Prices, + CurrencyPair, + Price, + Decimals, } impl<'de> serde::Deserialize<'de> for GeneratedField { fn deserialize(deserializer: D) -> std::result::Result @@ -1152,7 +1170,9 @@ impl<'de> serde::Deserialize<'de> for OracleData { E: serde::de::Error, { match value { - "prices" => Ok(GeneratedField::Prices), + "currencyPair" | "currency_pair" => Ok(GeneratedField::CurrencyPair), + "price" => Ok(GeneratedField::Price), + "decimals" => Ok(GeneratedField::Decimals), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -1162,36 +1182,54 @@ impl<'de> serde::Deserialize<'de> for OracleData { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = OracleData; + type Value = Price; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct astria.sequencerblock.v1.OracleData") + formatter.write_str("struct astria.sequencerblock.v1.Price") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - let mut prices__ = None; + let mut currency_pair__ = None; + let mut price__ = None; + let mut decimals__ = None; while let Some(k) = map_.next_key()? { match k { - GeneratedField::Prices => { - if prices__.is_some() { - return Err(serde::de::Error::duplicate_field("prices")); + GeneratedField::CurrencyPair => { + if currency_pair__.is_some() { + return Err(serde::de::Error::duplicate_field("currencyPair")); } - prices__ = Some(map_.next_value()?); + currency_pair__ = map_.next_value()?; + } + GeneratedField::Price => { + if price__.is_some() { + return Err(serde::de::Error::duplicate_field("price")); + } + price__ = map_.next_value()?; + } + GeneratedField::Decimals => { + if decimals__.is_some() { + return Err(serde::de::Error::duplicate_field("decimals")); + } + decimals__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; } } } - Ok(OracleData { - prices: prices__.unwrap_or_default(), + Ok(Price { + currency_pair: currency_pair__, + price: price__, + decimals: decimals__.unwrap_or_default(), }) } } - deserializer.deserialize_struct("astria.sequencerblock.v1.OracleData", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("astria.sequencerblock.v1.Price", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for Price { +impl serde::Serialize for PriceFeedData { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -1199,47 +1237,29 @@ impl serde::Serialize for Price { { use serde::ser::SerializeStruct; let mut len = 0; - if self.currency_pair.is_some() { - len += 1; - } - if self.price.is_some() { - len += 1; - } - if self.decimals != 0 { + if !self.prices.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("astria.sequencerblock.v1.Price", len)?; - if let Some(v) = self.currency_pair.as_ref() { - struct_ser.serialize_field("currencyPair", v)?; - } - if let Some(v) = self.price.as_ref() { - struct_ser.serialize_field("price", v)?; - } - if self.decimals != 0 { - #[allow(clippy::needless_borrow)] - struct_ser.serialize_field("decimals", ToString::to_string(&self.decimals).as_str())?; + let mut struct_ser = serializer.serialize_struct("astria.sequencerblock.v1.PriceFeedData", len)?; + if !self.prices.is_empty() { + struct_ser.serialize_field("prices", &self.prices)?; } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for Price { +impl<'de> serde::Deserialize<'de> for PriceFeedData { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where D: serde::Deserializer<'de>, { const FIELDS: &[&str] = &[ - "currency_pair", - "currencyPair", - "price", - "decimals", + "prices", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { - CurrencyPair, - Price, - Decimals, + Prices, } impl<'de> serde::Deserialize<'de> for GeneratedField { fn deserialize(deserializer: D) -> std::result::Result @@ -1261,9 +1281,7 @@ impl<'de> serde::Deserialize<'de> for Price { E: serde::de::Error, { match value { - "currencyPair" | "currency_pair" => Ok(GeneratedField::CurrencyPair), - "price" => Ok(GeneratedField::Price), - "decimals" => Ok(GeneratedField::Decimals), + "prices" => Ok(GeneratedField::Prices), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -1273,51 +1291,33 @@ impl<'de> serde::Deserialize<'de> for Price { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = Price; + type Value = PriceFeedData; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct astria.sequencerblock.v1.Price") + formatter.write_str("struct astria.sequencerblock.v1.PriceFeedData") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - let mut currency_pair__ = None; - let mut price__ = None; - let mut decimals__ = None; + let mut prices__ = None; while let Some(k) = map_.next_key()? { match k { - GeneratedField::CurrencyPair => { - if currency_pair__.is_some() { - return Err(serde::de::Error::duplicate_field("currencyPair")); - } - currency_pair__ = map_.next_value()?; - } - GeneratedField::Price => { - if price__.is_some() { - return Err(serde::de::Error::duplicate_field("price")); - } - price__ = map_.next_value()?; - } - GeneratedField::Decimals => { - if decimals__.is_some() { - return Err(serde::de::Error::duplicate_field("decimals")); + GeneratedField::Prices => { + if prices__.is_some() { + return Err(serde::de::Error::duplicate_field("prices")); } - decimals__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; + prices__ = Some(map_.next_value()?); } } } - Ok(Price { - currency_pair: currency_pair__, - price: price__, - decimals: decimals__.unwrap_or_default(), + Ok(PriceFeedData { + prices: prices__.unwrap_or_default(), }) } } - deserializer.deserialize_struct("astria.sequencerblock.v1.Price", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("astria.sequencerblock.v1.PriceFeedData", FIELDS, GeneratedVisitor) } } impl serde::Serialize for RollupData { @@ -1341,8 +1341,8 @@ impl serde::Serialize for RollupData { rollup_data::Value::Deposit(v) => { struct_ser.serialize_field("deposit", v)?; } - rollup_data::Value::OracleData(v) => { - struct_ser.serialize_field("oracleData", v)?; + rollup_data::Value::PriceFeedData(v) => { + struct_ser.serialize_field("priceFeedData", v)?; } } } @@ -1359,15 +1359,15 @@ impl<'de> serde::Deserialize<'de> for RollupData { "sequenced_data", "sequencedData", "deposit", - "oracle_data", - "oracleData", + "price_feed_data", + "priceFeedData", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { SequencedData, Deposit, - OracleData, + PriceFeedData, } impl<'de> serde::Deserialize<'de> for GeneratedField { fn deserialize(deserializer: D) -> std::result::Result @@ -1391,7 +1391,7 @@ impl<'de> serde::Deserialize<'de> for RollupData { match value { "sequencedData" | "sequenced_data" => Ok(GeneratedField::SequencedData), "deposit" => Ok(GeneratedField::Deposit), - "oracleData" | "oracle_data" => Ok(GeneratedField::OracleData), + "priceFeedData" | "price_feed_data" => Ok(GeneratedField::PriceFeedData), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -1427,11 +1427,11 @@ impl<'de> serde::Deserialize<'de> for RollupData { value__ = map_.next_value::<::std::option::Option<_>>()?.map(rollup_data::Value::Deposit) ; } - GeneratedField::OracleData => { + GeneratedField::PriceFeedData => { if value__.is_some() { - return Err(serde::de::Error::duplicate_field("oracleData")); + return Err(serde::de::Error::duplicate_field("priceFeedData")); } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(rollup_data::Value::OracleData) + value__ = map_.next_value::<::std::option::Option<_>>()?.map(rollup_data::Value::PriceFeedData) ; } } diff --git a/crates/astria-core/src/generated/astria.upgrades.v1.rs b/crates/astria-core/src/generated/astria.upgrades.v1.rs index 9712d35d94..bd1ff39a15 100644 --- a/crates/astria-core/src/generated/astria.upgrades.v1.rs +++ b/crates/astria-core/src/generated/astria.upgrades.v1.rs @@ -39,7 +39,7 @@ pub struct Upgrade1 { #[prost(message, optional, tag = "1")] pub base_info: ::core::option::Option, #[prost(message, optional, tag = "2")] - pub connect_oracle_change: ::core::option::Option, + pub price_feed_change: ::core::option::Option, #[prost(message, optional, tag = "3")] pub validator_update_action_change: ::core::option::Option< upgrade1::ValidatorUpdateActionChange, @@ -49,15 +49,15 @@ pub struct Upgrade1 { pub mod upgrade1 { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] - pub struct ConnectOracleChange { - /// The Connect oracle genesis data. + pub struct PriceFeedChange { + /// The price feed genesis data. #[prost(message, optional, tag = "1")] pub genesis: ::core::option::Option< - super::super::super::protocol::genesis::v1::ConnectGenesis, + super::super::super::protocol::genesis::v1::PriceFeedGenesis, >, } - impl ::prost::Name for ConnectOracleChange { - const NAME: &'static str = "ConnectOracleChange"; + impl ::prost::Name for PriceFeedChange { + const NAME: &'static str = "PriceFeedChange"; const PACKAGE: &'static str = "astria.upgrades.v1"; fn full_name() -> ::prost::alloc::string::String { ::prost::alloc::format!("astria.upgrades.v1.Upgrade1.{}", Self::NAME) diff --git a/crates/astria-core/src/generated/astria.upgrades.v1.serde.rs b/crates/astria-core/src/generated/astria.upgrades.v1.serde.rs index ce366fbe1c..36143bfa97 100644 --- a/crates/astria-core/src/generated/astria.upgrades.v1.serde.rs +++ b/crates/astria-core/src/generated/astria.upgrades.v1.serde.rs @@ -277,7 +277,7 @@ impl serde::Serialize for Upgrade1 { if self.base_info.is_some() { len += 1; } - if self.connect_oracle_change.is_some() { + if self.price_feed_change.is_some() { len += 1; } if self.validator_update_action_change.is_some() { @@ -287,8 +287,8 @@ impl serde::Serialize for Upgrade1 { if let Some(v) = self.base_info.as_ref() { struct_ser.serialize_field("baseInfo", v)?; } - if let Some(v) = self.connect_oracle_change.as_ref() { - struct_ser.serialize_field("connectOracleChange", v)?; + if let Some(v) = self.price_feed_change.as_ref() { + struct_ser.serialize_field("priceFeedChange", v)?; } if let Some(v) = self.validator_update_action_change.as_ref() { struct_ser.serialize_field("validatorUpdateActionChange", v)?; @@ -305,8 +305,8 @@ impl<'de> serde::Deserialize<'de> for Upgrade1 { const FIELDS: &[&str] = &[ "base_info", "baseInfo", - "connect_oracle_change", - "connectOracleChange", + "price_feed_change", + "priceFeedChange", "validator_update_action_change", "validatorUpdateActionChange", ]; @@ -314,7 +314,7 @@ impl<'de> serde::Deserialize<'de> for Upgrade1 { #[allow(clippy::enum_variant_names)] enum GeneratedField { BaseInfo, - ConnectOracleChange, + PriceFeedChange, ValidatorUpdateActionChange, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -338,7 +338,7 @@ impl<'de> serde::Deserialize<'de> for Upgrade1 { { match value { "baseInfo" | "base_info" => Ok(GeneratedField::BaseInfo), - "connectOracleChange" | "connect_oracle_change" => Ok(GeneratedField::ConnectOracleChange), + "priceFeedChange" | "price_feed_change" => Ok(GeneratedField::PriceFeedChange), "validatorUpdateActionChange" | "validator_update_action_change" => Ok(GeneratedField::ValidatorUpdateActionChange), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } @@ -360,7 +360,7 @@ impl<'de> serde::Deserialize<'de> for Upgrade1 { V: serde::de::MapAccess<'de>, { let mut base_info__ = None; - let mut connect_oracle_change__ = None; + let mut price_feed_change__ = None; let mut validator_update_action_change__ = None; while let Some(k) = map_.next_key()? { match k { @@ -370,11 +370,11 @@ impl<'de> serde::Deserialize<'de> for Upgrade1 { } base_info__ = map_.next_value()?; } - GeneratedField::ConnectOracleChange => { - if connect_oracle_change__.is_some() { - return Err(serde::de::Error::duplicate_field("connectOracleChange")); + GeneratedField::PriceFeedChange => { + if price_feed_change__.is_some() { + return Err(serde::de::Error::duplicate_field("priceFeedChange")); } - connect_oracle_change__ = map_.next_value()?; + price_feed_change__ = map_.next_value()?; } GeneratedField::ValidatorUpdateActionChange => { if validator_update_action_change__.is_some() { @@ -386,7 +386,7 @@ impl<'de> serde::Deserialize<'de> for Upgrade1 { } Ok(Upgrade1 { base_info: base_info__, - connect_oracle_change: connect_oracle_change__, + price_feed_change: price_feed_change__, validator_update_action_change: validator_update_action_change__, }) } @@ -394,7 +394,7 @@ impl<'de> serde::Deserialize<'de> for Upgrade1 { deserializer.deserialize_struct("astria.upgrades.v1.Upgrade1", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for upgrade1::ConnectOracleChange { +impl serde::Serialize for upgrade1::PriceFeedChange { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result where @@ -405,14 +405,14 @@ impl serde::Serialize for upgrade1::ConnectOracleChange { if self.genesis.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("astria.upgrades.v1.Upgrade1.ConnectOracleChange", len)?; + let mut struct_ser = serializer.serialize_struct("astria.upgrades.v1.Upgrade1.PriceFeedChange", len)?; if let Some(v) = self.genesis.as_ref() { struct_ser.serialize_field("genesis", v)?; } struct_ser.end() } } -impl<'de> serde::Deserialize<'de> for upgrade1::ConnectOracleChange { +impl<'de> serde::Deserialize<'de> for upgrade1::PriceFeedChange { #[allow(deprecated)] fn deserialize(deserializer: D) -> std::result::Result where @@ -456,13 +456,13 @@ impl<'de> serde::Deserialize<'de> for upgrade1::ConnectOracleChange { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = upgrade1::ConnectOracleChange; + type Value = upgrade1::PriceFeedChange; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct astria.upgrades.v1.Upgrade1.ConnectOracleChange") + formatter.write_str("struct astria.upgrades.v1.Upgrade1.PriceFeedChange") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { @@ -477,12 +477,12 @@ impl<'de> serde::Deserialize<'de> for upgrade1::ConnectOracleChange { } } } - Ok(upgrade1::ConnectOracleChange { + Ok(upgrade1::PriceFeedChange { genesis: genesis__, }) } } - deserializer.deserialize_struct("astria.upgrades.v1.Upgrade1.ConnectOracleChange", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("astria.upgrades.v1.Upgrade1.PriceFeedChange", FIELDS, GeneratedVisitor) } } impl serde::Serialize for upgrade1::ValidatorUpdateActionChange { diff --git a/crates/astria-core/src/generated/mod.rs b/crates/astria-core/src/generated/mod.rs index 12e8891268..2daab2d31b 100644 --- a/crates/astria-core/src/generated/mod.rs +++ b/crates/astria-core/src/generated/mod.rs @@ -98,8 +98,8 @@ pub mod astria { pub mod v1; } #[path = ""] - pub mod connect { - #[path = "astria.protocol.connect.v1.rs"] + pub mod price_feed { + #[path = "astria.protocol.price_feed.v1.rs"] pub mod v1; } #[path = ""] @@ -224,63 +224,63 @@ pub mod celestia { } #[path = ""] -pub mod connect { +pub mod price_feed { pub mod abci { pub mod v2 { - include!("connect.abci.v2.rs"); + include!("price_feed.abci.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("connect.abci.v2.serde.rs"); + include!("price_feed.abci.v2.serde.rs"); } } } pub mod marketmap { pub mod v2 { - include!("connect.marketmap.v2.rs"); + include!("price_feed.marketmap.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("connect.marketmap.v2.serde.rs"); + include!("price_feed.marketmap.v2.serde.rs"); } } } pub mod oracle { pub mod v2 { - include!("connect.oracle.v2.rs"); + include!("price_feed.oracle.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("connect.oracle.v2.serde.rs"); + include!("price_feed.oracle.v2.serde.rs"); } } } pub mod service { pub mod v2 { - include!("connect.service.v2.rs"); + include!("price_feed.service.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("connect.service.v2.serde.rs"); + include!("price_feed.service.v2.serde.rs"); } } } pub mod types { pub mod v2 { - include!("connect.types.v2.rs"); + include!("price_feed.types.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("connect.types.v2.serde.rs"); + include!("price_feed.types.v2.serde.rs"); } } } diff --git a/crates/astria-core/src/generated/connect.abci.v2.rs b/crates/astria-core/src/generated/price_feed.abci.v2.rs similarity index 85% rename from crates/astria-core/src/generated/connect.abci.v2.rs rename to crates/astria-core/src/generated/price_feed.abci.v2.rs index 6940f8594b..f21f0270ab 100644 --- a/crates/astria-core/src/generated/connect.abci.v2.rs +++ b/crates/astria-core/src/generated/price_feed.abci.v2.rs @@ -10,8 +10,8 @@ pub struct OracleVoteExtension { } impl ::prost::Name for OracleVoteExtension { const NAME: &'static str = "OracleVoteExtension"; - const PACKAGE: &'static str = "connect.abci.v2"; + const PACKAGE: &'static str = "price_feed.abci.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.abci.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.abci.v2.{}", Self::NAME) } } diff --git a/crates/astria-core/src/generated/connect.abci.v2.serde.rs b/crates/astria-core/src/generated/price_feed.abci.v2.serde.rs similarity index 92% rename from crates/astria-core/src/generated/connect.abci.v2.serde.rs rename to crates/astria-core/src/generated/price_feed.abci.v2.serde.rs index b909661c94..855aac4327 100644 --- a/crates/astria-core/src/generated/connect.abci.v2.serde.rs +++ b/crates/astria-core/src/generated/price_feed.abci.v2.serde.rs @@ -9,7 +9,7 @@ impl serde::Serialize for OracleVoteExtension { if !self.prices.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.abci.v2.OracleVoteExtension", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.abci.v2.OracleVoteExtension", len)?; if !self.prices.is_empty() { let v: std::collections::HashMap<_, _> = self.prices.iter() .map(|(k, v)| (k, pbjson::private::base64::encode(v))).collect(); @@ -65,7 +65,7 @@ impl<'de> serde::Deserialize<'de> for OracleVoteExtension { type Value = OracleVoteExtension; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.abci.v2.OracleVoteExtension") + formatter.write_str("struct price_feed.abci.v2.OracleVoteExtension") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -91,6 +91,6 @@ impl<'de> serde::Deserialize<'de> for OracleVoteExtension { }) } } - deserializer.deserialize_struct("connect.abci.v2.OracleVoteExtension", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.abci.v2.OracleVoteExtension", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/connect.marketmap.v2.rs b/crates/astria-core/src/generated/price_feed.marketmap.v2.rs similarity index 92% rename from crates/astria-core/src/generated/connect.marketmap.v2.rs rename to crates/astria-core/src/generated/price_feed.marketmap.v2.rs index 148e1e3db5..89d3bda4b0 100644 --- a/crates/astria-core/src/generated/connect.marketmap.v2.rs +++ b/crates/astria-core/src/generated/price_feed.marketmap.v2.rs @@ -13,9 +13,9 @@ pub struct Market { } impl ::prost::Name for Market { const NAME: &'static str = "Market"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// Ticker represents a price feed for a given asset pair i.e. BTC/USD. The price @@ -46,9 +46,9 @@ pub struct Ticker { } impl ::prost::Name for Ticker { const NAME: &'static str = "Ticker"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -80,9 +80,9 @@ pub struct ProviderConfig { } impl ::prost::Name for ProviderConfig { const NAME: &'static str = "ProviderConfig"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// MarketMap maps ticker strings to their Markets. @@ -99,9 +99,9 @@ pub struct MarketMap { } impl ::prost::Name for MarketMap { const NAME: &'static str = "MarketMap"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// Params defines the parameters for the x/marketmap module. @@ -119,9 +119,9 @@ pub struct Params { } impl ::prost::Name for Params { const NAME: &'static str = "Params"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// GenesisState defines the x/marketmap module's genesis state. @@ -143,9 +143,9 @@ pub struct GenesisState { } impl ::prost::Name for GenesisState { const NAME: &'static str = "GenesisState"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// MarketMapRequest is the query request for the MarketMap query. @@ -155,9 +155,9 @@ impl ::prost::Name for GenesisState { pub struct MarketMapRequest {} impl ::prost::Name for MarketMapRequest { const NAME: &'static str = "MarketMapRequest"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// MarketMapResponse is the query response for the MarketMap query. @@ -179,9 +179,9 @@ pub struct MarketMapResponse { } impl ::prost::Name for MarketMapResponse { const NAME: &'static str = "MarketMapResponse"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// MarketRequest is the query request for the Market query. @@ -196,9 +196,9 @@ pub struct MarketRequest { } impl ::prost::Name for MarketRequest { const NAME: &'static str = "MarketRequest"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// MarketResponse is the query response for the Market query. @@ -211,9 +211,9 @@ pub struct MarketResponse { } impl ::prost::Name for MarketResponse { const NAME: &'static str = "MarketResponse"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// ParamsRequest is the request type for the Query/Params RPC method. @@ -222,9 +222,9 @@ impl ::prost::Name for MarketResponse { pub struct ParamsRequest {} impl ::prost::Name for ParamsRequest { const NAME: &'static str = "ParamsRequest"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// ParamsResponse is the response type for the Query/Params RPC method. @@ -236,9 +236,9 @@ pub struct ParamsResponse { } impl ::prost::Name for ParamsResponse { const NAME: &'static str = "ParamsResponse"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// LastUpdatedRequest is the request type for the Query/LastUpdated RPC @@ -248,9 +248,9 @@ impl ::prost::Name for ParamsResponse { pub struct LastUpdatedRequest {} impl ::prost::Name for LastUpdatedRequest { const NAME: &'static str = "LastUpdatedRequest"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// LastUpdatedResponse is the response type for the Query/LastUpdated RPC @@ -263,9 +263,9 @@ pub struct LastUpdatedResponse { } impl ::prost::Name for LastUpdatedResponse { const NAME: &'static str = "LastUpdatedResponse"; - const PACKAGE: &'static str = "connect.marketmap.v2"; + const PACKAGE: &'static str = "price_feed.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) } } /// Generated client implementations. @@ -375,11 +375,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.marketmap.v2.Query/MarketMap", + "/price_feed.marketmap.v2.Query/MarketMap", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("connect.marketmap.v2.Query", "MarketMap")); + .insert(GrpcMethod::new("price_feed.marketmap.v2.Query", "MarketMap")); self.inner.unary(req, path, codec).await } /// Market returns a market stored in the x/marketmap @@ -399,11 +399,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.marketmap.v2.Query/Market", + "/price_feed.marketmap.v2.Query/Market", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("connect.marketmap.v2.Query", "Market")); + .insert(GrpcMethod::new("price_feed.marketmap.v2.Query", "Market")); self.inner.unary(req, path, codec).await } /// LastUpdated returns the last height the market map was updated at. @@ -425,11 +425,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.marketmap.v2.Query/LastUpdated", + "/price_feed.marketmap.v2.Query/LastUpdated", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("connect.marketmap.v2.Query", "LastUpdated")); + .insert(GrpcMethod::new("price_feed.marketmap.v2.Query", "LastUpdated")); self.inner.unary(req, path, codec).await } /// Params returns the current x/marketmap module parameters. @@ -448,11 +448,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.marketmap.v2.Query/Params", + "/price_feed.marketmap.v2.Query/Params", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("connect.marketmap.v2.Query", "Params")); + .insert(GrpcMethod::new("price_feed.marketmap.v2.Query", "Params")); self.inner.unary(req, path, codec).await } } @@ -574,7 +574,7 @@ pub mod query_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/connect.marketmap.v2.Query/MarketMap" => { + "/price_feed.marketmap.v2.Query/MarketMap" => { #[allow(non_camel_case_types)] struct MarketMapSvc(pub Arc); impl tonic::server::UnaryService @@ -618,7 +618,7 @@ pub mod query_server { }; Box::pin(fut) } - "/connect.marketmap.v2.Query/Market" => { + "/price_feed.marketmap.v2.Query/Market" => { #[allow(non_camel_case_types)] struct MarketSvc(pub Arc); impl tonic::server::UnaryService @@ -662,7 +662,7 @@ pub mod query_server { }; Box::pin(fut) } - "/connect.marketmap.v2.Query/LastUpdated" => { + "/price_feed.marketmap.v2.Query/LastUpdated" => { #[allow(non_camel_case_types)] struct LastUpdatedSvc(pub Arc); impl tonic::server::UnaryService @@ -706,7 +706,7 @@ pub mod query_server { }; Box::pin(fut) } - "/connect.marketmap.v2.Query/Params" => { + "/price_feed.marketmap.v2.Query/Params" => { #[allow(non_camel_case_types)] struct ParamsSvc(pub Arc); impl tonic::server::UnaryService @@ -788,6 +788,6 @@ pub mod query_server { } } impl tonic::server::NamedService for QueryServer { - const NAME: &'static str = "connect.marketmap.v2.Query"; + const NAME: &'static str = "price_feed.marketmap.v2.Query"; } } diff --git a/crates/astria-core/src/generated/connect.marketmap.v2.serde.rs b/crates/astria-core/src/generated/price_feed.marketmap.v2.serde.rs similarity index 92% rename from crates/astria-core/src/generated/connect.marketmap.v2.serde.rs rename to crates/astria-core/src/generated/price_feed.marketmap.v2.serde.rs index f73db9da9b..c037136a5c 100644 --- a/crates/astria-core/src/generated/connect.marketmap.v2.serde.rs +++ b/crates/astria-core/src/generated/price_feed.marketmap.v2.serde.rs @@ -15,7 +15,7 @@ impl serde::Serialize for GenesisState { if self.params.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.GenesisState", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.GenesisState", len)?; if let Some(v) = self.market_map.as_ref() { struct_ser.serialize_field("marketMap", v)?; } @@ -84,7 +84,7 @@ impl<'de> serde::Deserialize<'de> for GenesisState { type Value = GenesisState; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.GenesisState") + formatter.write_str("struct price_feed.marketmap.v2.GenesisState") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -125,7 +125,7 @@ impl<'de> serde::Deserialize<'de> for GenesisState { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.GenesisState", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.GenesisState", FIELDS, GeneratedVisitor) } } impl serde::Serialize for LastUpdatedRequest { @@ -136,7 +136,7 @@ impl serde::Serialize for LastUpdatedRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("connect.marketmap.v2.LastUpdatedRequest", len)?; + let struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.LastUpdatedRequest", len)?; struct_ser.end() } } @@ -182,7 +182,7 @@ impl<'de> serde::Deserialize<'de> for LastUpdatedRequest { type Value = LastUpdatedRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.LastUpdatedRequest") + formatter.write_str("struct price_feed.marketmap.v2.LastUpdatedRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -196,7 +196,7 @@ impl<'de> serde::Deserialize<'de> for LastUpdatedRequest { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.LastUpdatedRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.LastUpdatedRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for LastUpdatedResponse { @@ -210,7 +210,7 @@ impl serde::Serialize for LastUpdatedResponse { if self.last_updated != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.LastUpdatedResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.LastUpdatedResponse", len)?; if self.last_updated != 0 { #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lastUpdated", ToString::to_string(&self.last_updated).as_str())?; @@ -266,7 +266,7 @@ impl<'de> serde::Deserialize<'de> for LastUpdatedResponse { type Value = LastUpdatedResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.LastUpdatedResponse") + formatter.write_str("struct price_feed.marketmap.v2.LastUpdatedResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -291,7 +291,7 @@ impl<'de> serde::Deserialize<'de> for LastUpdatedResponse { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.LastUpdatedResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.LastUpdatedResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for Market { @@ -308,7 +308,7 @@ impl serde::Serialize for Market { if !self.provider_configs.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.Market", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.Market", len)?; if let Some(v) = self.ticker.as_ref() { struct_ser.serialize_field("ticker", v)?; } @@ -369,7 +369,7 @@ impl<'de> serde::Deserialize<'de> for Market { type Value = Market; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.Market") + formatter.write_str("struct price_feed.marketmap.v2.Market") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -400,7 +400,7 @@ impl<'de> serde::Deserialize<'de> for Market { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.Market", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.Market", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketMap { @@ -414,7 +414,7 @@ impl serde::Serialize for MarketMap { if !self.markets.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketMap", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketMap", len)?; if !self.markets.is_empty() { struct_ser.serialize_field("markets", &self.markets)?; } @@ -468,7 +468,7 @@ impl<'de> serde::Deserialize<'de> for MarketMap { type Value = MarketMap; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.MarketMap") + formatter.write_str("struct price_feed.marketmap.v2.MarketMap") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -493,7 +493,7 @@ impl<'de> serde::Deserialize<'de> for MarketMap { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.MarketMap", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.MarketMap", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketMapRequest { @@ -504,7 +504,7 @@ impl serde::Serialize for MarketMapRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketMapRequest", len)?; + let struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketMapRequest", len)?; struct_ser.end() } } @@ -550,7 +550,7 @@ impl<'de> serde::Deserialize<'de> for MarketMapRequest { type Value = MarketMapRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.MarketMapRequest") + formatter.write_str("struct price_feed.marketmap.v2.MarketMapRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -564,7 +564,7 @@ impl<'de> serde::Deserialize<'de> for MarketMapRequest { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.MarketMapRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.MarketMapRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketMapResponse { @@ -584,7 +584,7 @@ impl serde::Serialize for MarketMapResponse { if !self.chain_id.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketMapResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketMapResponse", len)?; if let Some(v) = self.market_map.as_ref() { struct_ser.serialize_field("marketMap", v)?; } @@ -654,7 +654,7 @@ impl<'de> serde::Deserialize<'de> for MarketMapResponse { type Value = MarketMapResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.MarketMapResponse") + formatter.write_str("struct price_feed.marketmap.v2.MarketMapResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -695,7 +695,7 @@ impl<'de> serde::Deserialize<'de> for MarketMapResponse { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.MarketMapResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.MarketMapResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketRequest { @@ -709,7 +709,7 @@ impl serde::Serialize for MarketRequest { if self.currency_pair.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketRequest", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketRequest", len)?; if let Some(v) = self.currency_pair.as_ref() { struct_ser.serialize_field("currencyPair", v)?; } @@ -764,7 +764,7 @@ impl<'de> serde::Deserialize<'de> for MarketRequest { type Value = MarketRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.MarketRequest") + formatter.write_str("struct price_feed.marketmap.v2.MarketRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -787,7 +787,7 @@ impl<'de> serde::Deserialize<'de> for MarketRequest { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.MarketRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.MarketRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketResponse { @@ -801,7 +801,7 @@ impl serde::Serialize for MarketResponse { if self.market.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketResponse", len)?; if let Some(v) = self.market.as_ref() { struct_ser.serialize_field("market", v)?; } @@ -855,7 +855,7 @@ impl<'de> serde::Deserialize<'de> for MarketResponse { type Value = MarketResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.MarketResponse") + formatter.write_str("struct price_feed.marketmap.v2.MarketResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -878,7 +878,7 @@ impl<'de> serde::Deserialize<'de> for MarketResponse { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.MarketResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.MarketResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for Params { @@ -895,7 +895,7 @@ impl serde::Serialize for Params { if !self.admin.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.Params", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.Params", len)?; if !self.market_authorities.is_empty() { struct_ser.serialize_field("marketAuthorities", &self.market_authorities)?; } @@ -956,7 +956,7 @@ impl<'de> serde::Deserialize<'de> for Params { type Value = Params; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.Params") + formatter.write_str("struct price_feed.marketmap.v2.Params") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -987,7 +987,7 @@ impl<'de> serde::Deserialize<'de> for Params { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.Params", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.Params", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ParamsRequest { @@ -998,7 +998,7 @@ impl serde::Serialize for ParamsRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("connect.marketmap.v2.ParamsRequest", len)?; + let struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.ParamsRequest", len)?; struct_ser.end() } } @@ -1044,7 +1044,7 @@ impl<'de> serde::Deserialize<'de> for ParamsRequest { type Value = ParamsRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.ParamsRequest") + formatter.write_str("struct price_feed.marketmap.v2.ParamsRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1058,7 +1058,7 @@ impl<'de> serde::Deserialize<'de> for ParamsRequest { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.ParamsRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.ParamsRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ParamsResponse { @@ -1072,7 +1072,7 @@ impl serde::Serialize for ParamsResponse { if self.params.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.ParamsResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.ParamsResponse", len)?; if let Some(v) = self.params.as_ref() { struct_ser.serialize_field("params", v)?; } @@ -1126,7 +1126,7 @@ impl<'de> serde::Deserialize<'de> for ParamsResponse { type Value = ParamsResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.ParamsResponse") + formatter.write_str("struct price_feed.marketmap.v2.ParamsResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1149,7 +1149,7 @@ impl<'de> serde::Deserialize<'de> for ParamsResponse { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.ParamsResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.ParamsResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ProviderConfig { @@ -1175,7 +1175,7 @@ impl serde::Serialize for ProviderConfig { if !self.metadata_json.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.ProviderConfig", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.ProviderConfig", len)?; if !self.name.is_empty() { struct_ser.serialize_field("name", &self.name)?; } @@ -1256,7 +1256,7 @@ impl<'de> serde::Deserialize<'de> for ProviderConfig { type Value = ProviderConfig; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.ProviderConfig") + formatter.write_str("struct price_feed.marketmap.v2.ProviderConfig") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1311,7 +1311,7 @@ impl<'de> serde::Deserialize<'de> for ProviderConfig { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.ProviderConfig", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.ProviderConfig", FIELDS, GeneratedVisitor) } } impl serde::Serialize for Ticker { @@ -1337,7 +1337,7 @@ impl serde::Serialize for Ticker { if !self.metadata_json.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.Ticker", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.Ticker", len)?; if let Some(v) = self.currency_pair.as_ref() { struct_ser.serialize_field("currencyPair", v)?; } @@ -1420,7 +1420,7 @@ impl<'de> serde::Deserialize<'de> for Ticker { type Value = Ticker; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.marketmap.v2.Ticker") + formatter.write_str("struct price_feed.marketmap.v2.Ticker") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1479,6 +1479,6 @@ impl<'de> serde::Deserialize<'de> for Ticker { }) } } - deserializer.deserialize_struct("connect.marketmap.v2.Ticker", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.marketmap.v2.Ticker", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/connect.oracle.v2.rs b/crates/astria-core/src/generated/price_feed.oracle.v2.rs similarity index 92% rename from crates/astria-core/src/generated/connect.oracle.v2.rs rename to crates/astria-core/src/generated/price_feed.oracle.v2.rs index 0815919721..95f8897896 100644 --- a/crates/astria-core/src/generated/connect.oracle.v2.rs +++ b/crates/astria-core/src/generated/price_feed.oracle.v2.rs @@ -16,9 +16,9 @@ pub struct QuotePrice { } impl ::prost::Name for QuotePrice { const NAME: &'static str = "QuotePrice"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// CurrencyPairState represents the stateful information tracked by the x/oracle @@ -39,9 +39,9 @@ pub struct CurrencyPairState { } impl ::prost::Name for CurrencyPairState { const NAME: &'static str = "CurrencyPairState"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// CurrencyPairGenesis is the information necessary for initialization of a @@ -66,9 +66,9 @@ pub struct CurrencyPairGenesis { } impl ::prost::Name for CurrencyPairGenesis { const NAME: &'static str = "CurrencyPairGenesis"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// GenesisState is the genesis-state for the x/oracle module, it takes a set of @@ -87,9 +87,9 @@ pub struct GenesisState { } impl ::prost::Name for GenesisState { const NAME: &'static str = "GenesisState"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -97,9 +97,9 @@ impl ::prost::Name for GenesisState { pub struct GetAllCurrencyPairsRequest {} impl ::prost::Name for GetAllCurrencyPairsRequest { const NAME: &'static str = "GetAllCurrencyPairsRequest"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// GetAllCurrencyPairsResponse returns all CurrencyPairs that the module is @@ -112,9 +112,9 @@ pub struct GetAllCurrencyPairsResponse { } impl ::prost::Name for GetAllCurrencyPairsResponse { const NAME: &'static str = "GetAllCurrencyPairsResponse"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// GetPriceRequest takes an identifier for the @@ -128,9 +128,9 @@ pub struct GetPriceRequest { } impl ::prost::Name for GetPriceRequest { const NAME: &'static str = "GetPriceRequest"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// GetPriceResponse is the response from the GetPrice grpc method exposed from @@ -155,9 +155,9 @@ pub struct GetPriceResponse { } impl ::prost::Name for GetPriceResponse { const NAME: &'static str = "GetPriceResponse"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// GetPricesRequest takes an identifier for the CurrencyPair @@ -170,9 +170,9 @@ pub struct GetPricesRequest { } impl ::prost::Name for GetPricesRequest { const NAME: &'static str = "GetPricesRequest"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// GetPricesResponse is the response from the GetPrices grpc method exposed from @@ -185,9 +185,9 @@ pub struct GetPricesResponse { } impl ::prost::Name for GetPricesResponse { const NAME: &'static str = "GetPricesResponse"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// GetCurrencyPairMappingRequest is the GetCurrencyPairMapping request type. @@ -196,9 +196,9 @@ impl ::prost::Name for GetPricesResponse { pub struct GetCurrencyPairMappingRequest {} impl ::prost::Name for GetCurrencyPairMappingRequest { const NAME: &'static str = "GetCurrencyPairMappingRequest"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// GetCurrencyPairMappingResponse is the GetCurrencyPairMapping response type. @@ -215,9 +215,9 @@ pub struct GetCurrencyPairMappingResponse { } impl ::prost::Name for GetCurrencyPairMappingResponse { const NAME: &'static str = "GetCurrencyPairMappingResponse"; - const PACKAGE: &'static str = "connect.oracle.v2"; + const PACKAGE: &'static str = "price_feed.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) } } /// Generated client implementations. @@ -326,12 +326,12 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.oracle.v2.Query/GetAllCurrencyPairs", + "/price_feed.oracle.v2.Query/GetAllCurrencyPairs", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("connect.oracle.v2.Query", "GetAllCurrencyPairs"), + GrpcMethod::new("price_feed.oracle.v2.Query", "GetAllCurrencyPairs"), ); self.inner.unary(req, path, codec).await } @@ -355,11 +355,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.oracle.v2.Query/GetPrice", + "/price_feed.oracle.v2.Query/GetPrice", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("connect.oracle.v2.Query", "GetPrice")); + .insert(GrpcMethod::new("price_feed.oracle.v2.Query", "GetPrice")); self.inner.unary(req, path, codec).await } pub async fn get_prices( @@ -380,11 +380,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.oracle.v2.Query/GetPrices", + "/price_feed.oracle.v2.Query/GetPrices", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("connect.oracle.v2.Query", "GetPrices")); + .insert(GrpcMethod::new("price_feed.oracle.v2.Query", "GetPrices")); self.inner.unary(req, path, codec).await } /// Get the mapping of currency pair ID -> currency pair. This is useful for @@ -408,12 +408,15 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.oracle.v2.Query/GetCurrencyPairMapping", + "/price_feed.oracle.v2.Query/GetCurrencyPairMapping", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("connect.oracle.v2.Query", "GetCurrencyPairMapping"), + GrpcMethod::new( + "price_feed.oracle.v2.Query", + "GetCurrencyPairMapping", + ), ); self.inner.unary(req, path, codec).await } @@ -542,7 +545,7 @@ pub mod query_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/connect.oracle.v2.Query/GetAllCurrencyPairs" => { + "/price_feed.oracle.v2.Query/GetAllCurrencyPairs" => { #[allow(non_camel_case_types)] struct GetAllCurrencyPairsSvc(pub Arc); impl< @@ -588,7 +591,7 @@ pub mod query_server { }; Box::pin(fut) } - "/connect.oracle.v2.Query/GetPrice" => { + "/price_feed.oracle.v2.Query/GetPrice" => { #[allow(non_camel_case_types)] struct GetPriceSvc(pub Arc); impl tonic::server::UnaryService @@ -632,7 +635,7 @@ pub mod query_server { }; Box::pin(fut) } - "/connect.oracle.v2.Query/GetPrices" => { + "/price_feed.oracle.v2.Query/GetPrices" => { #[allow(non_camel_case_types)] struct GetPricesSvc(pub Arc); impl tonic::server::UnaryService @@ -676,7 +679,7 @@ pub mod query_server { }; Box::pin(fut) } - "/connect.oracle.v2.Query/GetCurrencyPairMapping" => { + "/price_feed.oracle.v2.Query/GetCurrencyPairMapping" => { #[allow(non_camel_case_types)] struct GetCurrencyPairMappingSvc(pub Arc); impl< @@ -761,6 +764,6 @@ pub mod query_server { } } impl tonic::server::NamedService for QueryServer { - const NAME: &'static str = "connect.oracle.v2.Query"; + const NAME: &'static str = "price_feed.oracle.v2.Query"; } } diff --git a/crates/astria-core/src/generated/connect.oracle.v2.serde.rs b/crates/astria-core/src/generated/price_feed.oracle.v2.serde.rs similarity index 92% rename from crates/astria-core/src/generated/connect.oracle.v2.serde.rs rename to crates/astria-core/src/generated/price_feed.oracle.v2.serde.rs index 5bb4c9fa6b..87f087798d 100644 --- a/crates/astria-core/src/generated/connect.oracle.v2.serde.rs +++ b/crates/astria-core/src/generated/price_feed.oracle.v2.serde.rs @@ -18,7 +18,7 @@ impl serde::Serialize for CurrencyPairGenesis { if self.id != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.CurrencyPairGenesis", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.CurrencyPairGenesis", len)?; if let Some(v) = self.currency_pair.as_ref() { struct_ser.serialize_field("currencyPair", v)?; } @@ -94,7 +94,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPairGenesis { type Value = CurrencyPairGenesis; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.CurrencyPairGenesis") + formatter.write_str("struct price_feed.oracle.v2.CurrencyPairGenesis") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -145,7 +145,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPairGenesis { }) } } - deserializer.deserialize_struct("connect.oracle.v2.CurrencyPairGenesis", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.CurrencyPairGenesis", FIELDS, GeneratedVisitor) } } impl serde::Serialize for CurrencyPairState { @@ -165,7 +165,7 @@ impl serde::Serialize for CurrencyPairState { if self.id != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.CurrencyPairState", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.CurrencyPairState", len)?; if let Some(v) = self.price.as_ref() { struct_ser.serialize_field("price", v)?; } @@ -233,7 +233,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPairState { type Value = CurrencyPairState; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.CurrencyPairState") + formatter.write_str("struct price_feed.oracle.v2.CurrencyPairState") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -276,7 +276,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPairState { }) } } - deserializer.deserialize_struct("connect.oracle.v2.CurrencyPairState", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.CurrencyPairState", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GenesisState { @@ -293,7 +293,7 @@ impl serde::Serialize for GenesisState { if self.next_id != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GenesisState", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GenesisState", len)?; if !self.currency_pair_genesis.is_empty() { struct_ser.serialize_field("currencyPairGenesis", &self.currency_pair_genesis)?; } @@ -356,7 +356,7 @@ impl<'de> serde::Deserialize<'de> for GenesisState { type Value = GenesisState; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.GenesisState") + formatter.write_str("struct price_feed.oracle.v2.GenesisState") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -389,7 +389,7 @@ impl<'de> serde::Deserialize<'de> for GenesisState { }) } } - deserializer.deserialize_struct("connect.oracle.v2.GenesisState", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.GenesisState", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetAllCurrencyPairsRequest { @@ -400,7 +400,7 @@ impl serde::Serialize for GetAllCurrencyPairsRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("connect.oracle.v2.GetAllCurrencyPairsRequest", len)?; + let struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetAllCurrencyPairsRequest", len)?; struct_ser.end() } } @@ -446,7 +446,7 @@ impl<'de> serde::Deserialize<'de> for GetAllCurrencyPairsRequest { type Value = GetAllCurrencyPairsRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.GetAllCurrencyPairsRequest") + formatter.write_str("struct price_feed.oracle.v2.GetAllCurrencyPairsRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -460,7 +460,7 @@ impl<'de> serde::Deserialize<'de> for GetAllCurrencyPairsRequest { }) } } - deserializer.deserialize_struct("connect.oracle.v2.GetAllCurrencyPairsRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.GetAllCurrencyPairsRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetAllCurrencyPairsResponse { @@ -474,7 +474,7 @@ impl serde::Serialize for GetAllCurrencyPairsResponse { if !self.currency_pairs.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetAllCurrencyPairsResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetAllCurrencyPairsResponse", len)?; if !self.currency_pairs.is_empty() { struct_ser.serialize_field("currencyPairs", &self.currency_pairs)?; } @@ -529,7 +529,7 @@ impl<'de> serde::Deserialize<'de> for GetAllCurrencyPairsResponse { type Value = GetAllCurrencyPairsResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.GetAllCurrencyPairsResponse") + formatter.write_str("struct price_feed.oracle.v2.GetAllCurrencyPairsResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -552,7 +552,7 @@ impl<'de> serde::Deserialize<'de> for GetAllCurrencyPairsResponse { }) } } - deserializer.deserialize_struct("connect.oracle.v2.GetAllCurrencyPairsResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.GetAllCurrencyPairsResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetCurrencyPairMappingRequest { @@ -563,7 +563,7 @@ impl serde::Serialize for GetCurrencyPairMappingRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("connect.oracle.v2.GetCurrencyPairMappingRequest", len)?; + let struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetCurrencyPairMappingRequest", len)?; struct_ser.end() } } @@ -609,7 +609,7 @@ impl<'de> serde::Deserialize<'de> for GetCurrencyPairMappingRequest { type Value = GetCurrencyPairMappingRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.GetCurrencyPairMappingRequest") + formatter.write_str("struct price_feed.oracle.v2.GetCurrencyPairMappingRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -623,7 +623,7 @@ impl<'de> serde::Deserialize<'de> for GetCurrencyPairMappingRequest { }) } } - deserializer.deserialize_struct("connect.oracle.v2.GetCurrencyPairMappingRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.GetCurrencyPairMappingRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetCurrencyPairMappingResponse { @@ -637,7 +637,7 @@ impl serde::Serialize for GetCurrencyPairMappingResponse { if !self.currency_pair_mapping.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetCurrencyPairMappingResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetCurrencyPairMappingResponse", len)?; if !self.currency_pair_mapping.is_empty() { struct_ser.serialize_field("currencyPairMapping", &self.currency_pair_mapping)?; } @@ -692,7 +692,7 @@ impl<'de> serde::Deserialize<'de> for GetCurrencyPairMappingResponse { type Value = GetCurrencyPairMappingResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.GetCurrencyPairMappingResponse") + formatter.write_str("struct price_feed.oracle.v2.GetCurrencyPairMappingResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -718,7 +718,7 @@ impl<'de> serde::Deserialize<'de> for GetCurrencyPairMappingResponse { }) } } - deserializer.deserialize_struct("connect.oracle.v2.GetCurrencyPairMappingResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.GetCurrencyPairMappingResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetPriceRequest { @@ -732,7 +732,7 @@ impl serde::Serialize for GetPriceRequest { if !self.currency_pair.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetPriceRequest", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetPriceRequest", len)?; if !self.currency_pair.is_empty() { struct_ser.serialize_field("currencyPair", &self.currency_pair)?; } @@ -787,7 +787,7 @@ impl<'de> serde::Deserialize<'de> for GetPriceRequest { type Value = GetPriceRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.GetPriceRequest") + formatter.write_str("struct price_feed.oracle.v2.GetPriceRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -810,7 +810,7 @@ impl<'de> serde::Deserialize<'de> for GetPriceRequest { }) } } - deserializer.deserialize_struct("connect.oracle.v2.GetPriceRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.GetPriceRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetPriceResponse { @@ -833,7 +833,7 @@ impl serde::Serialize for GetPriceResponse { if self.id != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetPriceResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetPriceResponse", len)?; if let Some(v) = self.price.as_ref() { struct_ser.serialize_field("price", v)?; } @@ -908,7 +908,7 @@ impl<'de> serde::Deserialize<'de> for GetPriceResponse { type Value = GetPriceResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.GetPriceResponse") + formatter.write_str("struct price_feed.oracle.v2.GetPriceResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -961,7 +961,7 @@ impl<'de> serde::Deserialize<'de> for GetPriceResponse { }) } } - deserializer.deserialize_struct("connect.oracle.v2.GetPriceResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.GetPriceResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetPricesRequest { @@ -975,7 +975,7 @@ impl serde::Serialize for GetPricesRequest { if !self.currency_pair_ids.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetPricesRequest", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetPricesRequest", len)?; if !self.currency_pair_ids.is_empty() { struct_ser.serialize_field("currencyPairIds", &self.currency_pair_ids)?; } @@ -1030,7 +1030,7 @@ impl<'de> serde::Deserialize<'de> for GetPricesRequest { type Value = GetPricesRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.GetPricesRequest") + formatter.write_str("struct price_feed.oracle.v2.GetPricesRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1053,7 +1053,7 @@ impl<'de> serde::Deserialize<'de> for GetPricesRequest { }) } } - deserializer.deserialize_struct("connect.oracle.v2.GetPricesRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.GetPricesRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetPricesResponse { @@ -1067,7 +1067,7 @@ impl serde::Serialize for GetPricesResponse { if !self.prices.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetPricesResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetPricesResponse", len)?; if !self.prices.is_empty() { struct_ser.serialize_field("prices", &self.prices)?; } @@ -1121,7 +1121,7 @@ impl<'de> serde::Deserialize<'de> for GetPricesResponse { type Value = GetPricesResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.GetPricesResponse") + formatter.write_str("struct price_feed.oracle.v2.GetPricesResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1144,7 +1144,7 @@ impl<'de> serde::Deserialize<'de> for GetPricesResponse { }) } } - deserializer.deserialize_struct("connect.oracle.v2.GetPricesResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.GetPricesResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QuotePrice { @@ -1164,7 +1164,7 @@ impl serde::Serialize for QuotePrice { if self.block_height != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.QuotePrice", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.QuotePrice", len)?; if !self.price.is_empty() { struct_ser.serialize_field("price", &self.price)?; } @@ -1233,7 +1233,7 @@ impl<'de> serde::Deserialize<'de> for QuotePrice { type Value = QuotePrice; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.oracle.v2.QuotePrice") + formatter.write_str("struct price_feed.oracle.v2.QuotePrice") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1274,6 +1274,6 @@ impl<'de> serde::Deserialize<'de> for QuotePrice { }) } } - deserializer.deserialize_struct("connect.oracle.v2.QuotePrice", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.oracle.v2.QuotePrice", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/connect.service.v2.rs b/crates/astria-core/src/generated/price_feed.service.v2.rs similarity index 93% rename from crates/astria-core/src/generated/connect.service.v2.rs rename to crates/astria-core/src/generated/price_feed.service.v2.rs index fadf917481..fa4827dcae 100644 --- a/crates/astria-core/src/generated/connect.service.v2.rs +++ b/crates/astria-core/src/generated/price_feed.service.v2.rs @@ -4,9 +4,9 @@ pub struct QueryPricesRequest {} impl ::prost::Name for QueryPricesRequest { const NAME: &'static str = "QueryPricesRequest"; - const PACKAGE: &'static str = "connect.service.v2"; + const PACKAGE: &'static str = "price_feed.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) } } /// QueryPricesResponse defines the response type for the Prices method. @@ -28,9 +28,9 @@ pub struct QueryPricesResponse { } impl ::prost::Name for QueryPricesResponse { const NAME: &'static str = "QueryPricesResponse"; - const PACKAGE: &'static str = "connect.service.v2"; + const PACKAGE: &'static str = "price_feed.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) } } /// QueryMarketMapRequest defines the request type for the MarketMap method. @@ -39,9 +39,9 @@ impl ::prost::Name for QueryPricesResponse { pub struct QueryMarketMapRequest {} impl ::prost::Name for QueryMarketMapRequest { const NAME: &'static str = "QueryMarketMapRequest"; - const PACKAGE: &'static str = "connect.service.v2"; + const PACKAGE: &'static str = "price_feed.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) } } /// QueryMarketMapResponse defines the response type for the MarketMap method. @@ -54,9 +54,9 @@ pub struct QueryMarketMapResponse { } impl ::prost::Name for QueryMarketMapResponse { const NAME: &'static str = "QueryMarketMapResponse"; - const PACKAGE: &'static str = "connect.service.v2"; + const PACKAGE: &'static str = "price_feed.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) } } /// QueryVersionRequest defines the request type for the Version method. @@ -65,9 +65,9 @@ impl ::prost::Name for QueryMarketMapResponse { pub struct QueryVersionRequest {} impl ::prost::Name for QueryVersionRequest { const NAME: &'static str = "QueryVersionRequest"; - const PACKAGE: &'static str = "connect.service.v2"; + const PACKAGE: &'static str = "price_feed.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) } } /// QueryVersionResponse defines the response type for the Version method. @@ -80,9 +80,9 @@ pub struct QueryVersionResponse { } impl ::prost::Name for QueryVersionResponse { const NAME: &'static str = "QueryVersionResponse"; - const PACKAGE: &'static str = "connect.service.v2"; + const PACKAGE: &'static str = "price_feed.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) } } /// Generated client implementations. @@ -191,11 +191,11 @@ pub mod oracle_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.service.v2.Oracle/Prices", + "/price_feed.service.v2.Oracle/Prices", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("connect.service.v2.Oracle", "Prices")); + .insert(GrpcMethod::new("price_feed.service.v2.Oracle", "Prices")); self.inner.unary(req, path, codec).await } /// MarketMap defines a method for fetching the latest market map @@ -218,11 +218,11 @@ pub mod oracle_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.service.v2.Oracle/MarketMap", + "/price_feed.service.v2.Oracle/MarketMap", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("connect.service.v2.Oracle", "MarketMap")); + .insert(GrpcMethod::new("price_feed.service.v2.Oracle", "MarketMap")); self.inner.unary(req, path, codec).await } /// Version defines a method for fetching the current version of the oracle @@ -245,11 +245,11 @@ pub mod oracle_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/connect.service.v2.Oracle/Version", + "/price_feed.service.v2.Oracle/Version", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("connect.service.v2.Oracle", "Version")); + .insert(GrpcMethod::new("price_feed.service.v2.Oracle", "Version")); self.inner.unary(req, path, codec).await } } @@ -369,7 +369,7 @@ pub mod oracle_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/connect.service.v2.Oracle/Prices" => { + "/price_feed.service.v2.Oracle/Prices" => { #[allow(non_camel_case_types)] struct PricesSvc(pub Arc); impl< @@ -415,7 +415,7 @@ pub mod oracle_server { }; Box::pin(fut) } - "/connect.service.v2.Oracle/MarketMap" => { + "/price_feed.service.v2.Oracle/MarketMap" => { #[allow(non_camel_case_types)] struct MarketMapSvc(pub Arc); impl< @@ -461,7 +461,7 @@ pub mod oracle_server { }; Box::pin(fut) } - "/connect.service.v2.Oracle/Version" => { + "/price_feed.service.v2.Oracle/Version" => { #[allow(non_camel_case_types)] struct VersionSvc(pub Arc); impl< @@ -545,6 +545,6 @@ pub mod oracle_server { } } impl tonic::server::NamedService for OracleServer { - const NAME: &'static str = "connect.service.v2.Oracle"; + const NAME: &'static str = "price_feed.service.v2.Oracle"; } } diff --git a/crates/astria-core/src/generated/connect.service.v2.serde.rs b/crates/astria-core/src/generated/price_feed.service.v2.serde.rs similarity index 90% rename from crates/astria-core/src/generated/connect.service.v2.serde.rs rename to crates/astria-core/src/generated/price_feed.service.v2.serde.rs index a67adb978d..6fad5c47e7 100644 --- a/crates/astria-core/src/generated/connect.service.v2.serde.rs +++ b/crates/astria-core/src/generated/price_feed.service.v2.serde.rs @@ -6,7 +6,7 @@ impl serde::Serialize for QueryMarketMapRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("connect.service.v2.QueryMarketMapRequest", len)?; + let struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryMarketMapRequest", len)?; struct_ser.end() } } @@ -52,7 +52,7 @@ impl<'de> serde::Deserialize<'de> for QueryMarketMapRequest { type Value = QueryMarketMapRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.service.v2.QueryMarketMapRequest") + formatter.write_str("struct price_feed.service.v2.QueryMarketMapRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -66,7 +66,7 @@ impl<'de> serde::Deserialize<'de> for QueryMarketMapRequest { }) } } - deserializer.deserialize_struct("connect.service.v2.QueryMarketMapRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.service.v2.QueryMarketMapRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryMarketMapResponse { @@ -80,7 +80,7 @@ impl serde::Serialize for QueryMarketMapResponse { if self.market_map.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.service.v2.QueryMarketMapResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryMarketMapResponse", len)?; if let Some(v) = self.market_map.as_ref() { struct_ser.serialize_field("marketMap", v)?; } @@ -135,7 +135,7 @@ impl<'de> serde::Deserialize<'de> for QueryMarketMapResponse { type Value = QueryMarketMapResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.service.v2.QueryMarketMapResponse") + formatter.write_str("struct price_feed.service.v2.QueryMarketMapResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -158,7 +158,7 @@ impl<'de> serde::Deserialize<'de> for QueryMarketMapResponse { }) } } - deserializer.deserialize_struct("connect.service.v2.QueryMarketMapResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.service.v2.QueryMarketMapResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryPricesRequest { @@ -169,7 +169,7 @@ impl serde::Serialize for QueryPricesRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("connect.service.v2.QueryPricesRequest", len)?; + let struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryPricesRequest", len)?; struct_ser.end() } } @@ -215,7 +215,7 @@ impl<'de> serde::Deserialize<'de> for QueryPricesRequest { type Value = QueryPricesRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.service.v2.QueryPricesRequest") + formatter.write_str("struct price_feed.service.v2.QueryPricesRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -229,7 +229,7 @@ impl<'de> serde::Deserialize<'de> for QueryPricesRequest { }) } } - deserializer.deserialize_struct("connect.service.v2.QueryPricesRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.service.v2.QueryPricesRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryPricesResponse { @@ -249,7 +249,7 @@ impl serde::Serialize for QueryPricesResponse { if !self.version.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.service.v2.QueryPricesResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryPricesResponse", len)?; if !self.prices.is_empty() { struct_ser.serialize_field("prices", &self.prices)?; } @@ -315,7 +315,7 @@ impl<'de> serde::Deserialize<'de> for QueryPricesResponse { type Value = QueryPricesResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.service.v2.QueryPricesResponse") + formatter.write_str("struct price_feed.service.v2.QueryPricesResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -356,7 +356,7 @@ impl<'de> serde::Deserialize<'de> for QueryPricesResponse { }) } } - deserializer.deserialize_struct("connect.service.v2.QueryPricesResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.service.v2.QueryPricesResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryVersionRequest { @@ -367,7 +367,7 @@ impl serde::Serialize for QueryVersionRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("connect.service.v2.QueryVersionRequest", len)?; + let struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryVersionRequest", len)?; struct_ser.end() } } @@ -413,7 +413,7 @@ impl<'de> serde::Deserialize<'de> for QueryVersionRequest { type Value = QueryVersionRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.service.v2.QueryVersionRequest") + formatter.write_str("struct price_feed.service.v2.QueryVersionRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -427,7 +427,7 @@ impl<'de> serde::Deserialize<'de> for QueryVersionRequest { }) } } - deserializer.deserialize_struct("connect.service.v2.QueryVersionRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.service.v2.QueryVersionRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryVersionResponse { @@ -441,7 +441,7 @@ impl serde::Serialize for QueryVersionResponse { if !self.version.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.service.v2.QueryVersionResponse", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryVersionResponse", len)?; if !self.version.is_empty() { struct_ser.serialize_field("version", &self.version)?; } @@ -495,7 +495,7 @@ impl<'de> serde::Deserialize<'de> for QueryVersionResponse { type Value = QueryVersionResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.service.v2.QueryVersionResponse") + formatter.write_str("struct price_feed.service.v2.QueryVersionResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -518,6 +518,6 @@ impl<'de> serde::Deserialize<'de> for QueryVersionResponse { }) } } - deserializer.deserialize_struct("connect.service.v2.QueryVersionResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.service.v2.QueryVersionResponse", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/connect.types.v2.rs b/crates/astria-core/src/generated/price_feed.types.v2.rs similarity index 81% rename from crates/astria-core/src/generated/connect.types.v2.rs rename to crates/astria-core/src/generated/price_feed.types.v2.rs index 4ee9cb5851..6d9b75e303 100644 --- a/crates/astria-core/src/generated/connect.types.v2.rs +++ b/crates/astria-core/src/generated/price_feed.types.v2.rs @@ -10,8 +10,8 @@ pub struct CurrencyPair { } impl ::prost::Name for CurrencyPair { const NAME: &'static str = "CurrencyPair"; - const PACKAGE: &'static str = "connect.types.v2"; + const PACKAGE: &'static str = "price_feed.types.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("connect.types.v2.{}", Self::NAME) + ::prost::alloc::format!("price_feed.types.v2.{}", Self::NAME) } } diff --git a/crates/astria-core/src/generated/connect.types.v2.serde.rs b/crates/astria-core/src/generated/price_feed.types.v2.serde.rs similarity index 93% rename from crates/astria-core/src/generated/connect.types.v2.serde.rs rename to crates/astria-core/src/generated/price_feed.types.v2.serde.rs index 695fdcca9e..e5fb8a5161 100644 --- a/crates/astria-core/src/generated/connect.types.v2.serde.rs +++ b/crates/astria-core/src/generated/price_feed.types.v2.serde.rs @@ -12,7 +12,7 @@ impl serde::Serialize for CurrencyPair { if !self.quote.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("connect.types.v2.CurrencyPair", len)?; + let mut struct_ser = serializer.serialize_struct("price_feed.types.v2.CurrencyPair", len)?; if !self.base.is_empty() { struct_ser.serialize_field("Base", &self.base)?; } @@ -72,7 +72,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPair { type Value = CurrencyPair; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct connect.types.v2.CurrencyPair") + formatter.write_str("struct price_feed.types.v2.CurrencyPair") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -103,6 +103,6 @@ impl<'de> serde::Deserialize<'de> for CurrencyPair { }) } } - deserializer.deserialize_struct("connect.types.v2.CurrencyPair", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("price_feed.types.v2.CurrencyPair", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/lib.rs b/crates/astria-core/src/lib.rs index 9d857e14c6..5d56bda132 100644 --- a/crates/astria-core/src/lib.rs +++ b/crates/astria-core/src/lib.rs @@ -14,8 +14,8 @@ compile_error!( reason = "cannot prevent allow attributes in generated files" )] pub mod generated; -pub mod connect; pub mod execution; +pub mod oracles; pub mod primitive; pub mod protocol; pub mod sequencerblock; diff --git a/crates/astria-core/src/oracles/mod.rs b/crates/astria-core/src/oracles/mod.rs new file mode 100644 index 0000000000..d889458b44 --- /dev/null +++ b/crates/astria-core/src/oracles/mod.rs @@ -0,0 +1 @@ +pub mod price_feed; diff --git a/crates/astria-core/src/connect/abci.rs b/crates/astria-core/src/oracles/price_feed/abci.rs similarity index 89% rename from crates/astria-core/src/connect/abci.rs rename to crates/astria-core/src/oracles/price_feed/abci.rs index 0394cec7fb..cfc8b29578 100644 --- a/crates/astria-core/src/connect/abci.rs +++ b/crates/astria-core/src/oracles/price_feed/abci.rs @@ -3,11 +3,11 @@ pub mod v2 { use indexmap::IndexMap; use crate::{ - connect::types::v2::{ + generated::price_feed::abci::v2 as raw, + oracles::price_feed::types::v2::{ CurrencyPairId, Price, }, - generated::connect::abci::v2 as raw, }; #[derive(Debug, thiserror::Error)] @@ -15,12 +15,12 @@ pub mod v2 { pub struct OracleVoteExtensionError(#[from] OracleVoteExtensionErrorKind); #[derive(Debug, thiserror::Error)] - #[error("failed to validate connect.abci.v2.OracleVoteExtension")] + #[error("failed to validate price_feed.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, + source: crate::oracles::price_feed::types::v2::DecodePriceError, }, } diff --git a/crates/astria-core/src/connect/market_map.rs b/crates/astria-core/src/oracles/price_feed/market_map.rs similarity index 99% rename from crates/astria-core/src/connect/market_map.rs rename to crates/astria-core/src/oracles/price_feed/market_map.rs index f50c8c3cdb..fc51e3243e 100644 --- a/crates/astria-core/src/connect/market_map.rs +++ b/crates/astria-core/src/oracles/price_feed/market_map.rs @@ -11,11 +11,11 @@ pub mod v2 { use indexmap::IndexMap; use crate::{ - connect::types::v2::{ + generated::price_feed::marketmap::v2 as raw, + oracles::price_feed::types::v2::{ CurrencyPair, CurrencyPairError, }, - generated::connect::marketmap::v2 as raw, primitive::v1::{ Address, AddressError, diff --git a/crates/astria-core/src/connect/mod.rs b/crates/astria-core/src/oracles/price_feed/mod.rs similarity index 100% rename from crates/astria-core/src/connect/mod.rs rename to crates/astria-core/src/oracles/price_feed/mod.rs diff --git a/crates/astria-core/src/connect/oracle.rs b/crates/astria-core/src/oracles/price_feed/oracle.rs similarity index 99% rename from crates/astria-core/src/connect/oracle.rs rename to crates/astria-core/src/oracles/price_feed/oracle.rs index ed88a47ddd..2767c5f758 100644 --- a/crates/astria-core/src/connect/oracle.rs +++ b/crates/astria-core/src/oracles/price_feed/oracle.rs @@ -8,7 +8,8 @@ pub mod v2 { use pbjson_types::Timestamp; use crate::{ - connect::types::v2::{ + generated::price_feed::oracle::v2 as raw, + oracles::price_feed::types::v2::{ CurrencyPair, CurrencyPairError, CurrencyPairId, @@ -16,7 +17,6 @@ pub mod v2 { ParsePriceError, Price, }, - generated::connect::oracle::v2 as raw, Protobuf, }; diff --git a/crates/astria-core/src/connect/service.rs b/crates/astria-core/src/oracles/price_feed/service.rs similarity index 96% rename from crates/astria-core/src/connect/service.rs rename to crates/astria-core/src/oracles/price_feed/service.rs index cf111f1648..394bb3f33d 100644 --- a/crates/astria-core/src/connect/service.rs +++ b/crates/astria-core/src/oracles/price_feed/service.rs @@ -2,13 +2,13 @@ pub mod v2 { use indexmap::IndexMap; use crate::{ - connect::types::v2::{ + generated::price_feed::service::v2 as raw, + oracles::price_feed::types::v2::{ CurrencyPair, CurrencyPairParseError, ParsePriceError, Price, }, - generated::connect::service::v2 as raw, }; #[derive(Debug, thiserror::Error)] diff --git a/crates/astria-core/src/connect/types.rs b/crates/astria-core/src/oracles/price_feed/types.rs similarity index 99% rename from crates/astria-core/src/connect/types.rs rename to crates/astria-core/src/oracles/price_feed/types.rs index c68f4fcea6..110faed57a 100644 --- a/crates/astria-core/src/connect/types.rs +++ b/crates/astria-core/src/oracles/price_feed/types.rs @@ -12,7 +12,7 @@ pub mod v2 { use borsh::BorshSerialize; use bytes::Bytes; - use crate::generated::connect::types::v2 as raw; + use crate::generated::price_feed::types::v2 as raw; #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, BorshSerialize)] pub struct Price(u128); diff --git a/crates/astria-core/src/connect/utils.rs b/crates/astria-core/src/oracles/price_feed/utils.rs similarity index 96% rename from crates/astria-core/src/connect/utils.rs rename to crates/astria-core/src/oracles/price_feed/utils.rs index a0d425c8dc..956fbbeb7b 100644 --- a/crates/astria-core/src/connect/utils.rs +++ b/crates/astria-core/src/oracles/price_feed/utils.rs @@ -3,7 +3,8 @@ use prost::Message as _; use tendermint::abci::types::ExtendedCommitInfo; use crate::{ - connect::{ + generated::price_feed::abci::v2::OracleVoteExtension as RawOracleVoteExtension, + oracles::price_feed::{ abci::v2::{ OracleVoteExtension, OracleVoteExtensionError, @@ -13,8 +14,7 @@ use crate::{ Price, }, }, - generated::connect::abci::v2::OracleVoteExtension as RawOracleVoteExtension, - protocol::connect::v1::CurrencyPairInfo, + protocol::price_feed::v1::CurrencyPairInfo, }; #[derive(Debug, thiserror::Error)] @@ -33,9 +33,9 @@ impl Error { #[derive(Debug, thiserror::Error)] enum ErrorKind { - #[error("failed to decode oracle vote extension")] + #[error("failed to decode price feed oracle vote extension")] DecodeError(#[from] prost::DecodeError), - #[error("failed to convert raw oracle vote extension to native")] + #[error("failed to convert raw price feed oracle vote extension to native")] InvalidOracleVoteExtension(#[from] OracleVoteExtensionError), } diff --git a/crates/astria-core/src/protocol/genesis/snapshots/astria_core__protocol__genesis__v1__tests__genesis_state.snap b/crates/astria-core/src/protocol/genesis/snapshots/astria_core__protocol__genesis__v1__tests__genesis_state.snap index 004306d1e7..721cfaf3d6 100644 --- a/crates/astria-core/src/protocol/genesis/snapshots/astria_core__protocol__genesis__v1__tests__genesis_state.snap +++ b/crates/astria-core/src/protocol/genesis/snapshots/astria_core__protocol__genesis__v1__tests__genesis_state.snap @@ -141,7 +141,7 @@ expression: genesis_state() "multiplier": {} } }, - "connect": { + "priceFeed": { "marketMap": { "marketMap": { "markets": { diff --git a/crates/astria-core/src/protocol/genesis/v1.rs b/crates/astria-core/src/protocol/genesis/v1.rs index 1d809b8ec8..de4e93a485 100644 --- a/crates/astria-core/src/protocol/genesis/v1.rs +++ b/crates/astria-core/src/protocol/genesis/v1.rs @@ -5,11 +5,11 @@ pub use penumbra_ibc::params::IBCParameters; use penumbra_ibc::IbcRelay; use crate::{ - connect::{ + generated::astria::protocol::genesis::v1 as raw, + oracles::price_feed::{ market_map, oracle, }, - generated::astria::protocol::genesis::v1 as raw, primitive::v1::{ asset::{ self, @@ -48,12 +48,12 @@ use crate::{ }; #[derive(Clone, Debug, BorshSerialize)] -pub struct ConnectGenesis { +pub struct PriceFeedGenesis { market_map: market_map::v2::GenesisState, oracle: oracle::v2::GenesisState, } -impl ConnectGenesis { +impl PriceFeedGenesis { #[must_use] pub fn market_map(&self) -> &market_map::v2::GenesisState { &self.market_map @@ -65,9 +65,9 @@ impl ConnectGenesis { } } -impl Protobuf for ConnectGenesis { - type Error = ConnectGenesisError; - type Raw = raw::ConnectGenesis; +impl Protobuf for PriceFeedGenesis { + type Error = PriceFeedGenesisError; + type Raw = raw::PriceFeedGenesis; fn try_from_raw_ref(raw: &Self::Raw) -> Result { let Self::Raw { @@ -105,47 +105,47 @@ impl Protobuf for ConnectGenesis { } } -impl TryFrom for ConnectGenesis { +impl TryFrom for PriceFeedGenesis { type Error = ::Error; - fn try_from(value: raw::ConnectGenesis) -> Result { + fn try_from(value: raw::PriceFeedGenesis) -> Result { Self::try_from_raw(value) } } -impl From for raw::ConnectGenesis { - fn from(value: ConnectGenesis) -> Self { +impl From for raw::PriceFeedGenesis { + fn from(value: PriceFeedGenesis) -> Self { value.into_raw() } } #[derive(Debug, thiserror::Error)] #[error(transparent)] -pub struct ConnectGenesisError(ConnectGenesisErrorKind); +pub struct PriceFeedGenesisError(PriceFeedGenesisErrorKind); -impl ConnectGenesisError { +impl PriceFeedGenesisError { fn field_not_set(name: &'static str) -> Self { - Self(ConnectGenesisErrorKind::FieldNotSet { + Self(PriceFeedGenesisErrorKind::FieldNotSet { name, }) } fn market_map(source: market_map::v2::GenesisStateError) -> Self { - Self(ConnectGenesisErrorKind::MarketMap { + Self(PriceFeedGenesisErrorKind::MarketMap { source, }) } fn oracle(source: oracle::v2::GenesisStateError) -> Self { - Self(ConnectGenesisErrorKind::Oracle { + Self(PriceFeedGenesisErrorKind::Oracle { source, }) } } #[derive(Debug, thiserror::Error)] -#[error("failed ensuring invariants of {}", ConnectGenesis::full_name())] -enum ConnectGenesisErrorKind { +#[error("failed ensuring invariants of {}", PriceFeedGenesis::full_name())] +enum PriceFeedGenesisErrorKind { #[error("field was not set: `{name}`")] FieldNotSet { name: &'static str }, #[error("`market_map` field was invalid")] @@ -179,7 +179,7 @@ pub struct GenesisAppState { ibc_parameters: IBCParameters, allowed_fee_assets: Vec, fees: GenesisFees, - connect: Option, + price_feed: Option, } impl GenesisAppState { @@ -234,8 +234,8 @@ impl GenesisAppState { } #[must_use] - pub fn connect(&self) -> &Option { - &self.connect + pub fn price_feed(&self) -> &Option { + &self.price_feed } fn ensure_address_has_base_prefix( @@ -269,8 +269,8 @@ impl GenesisAppState { self.ensure_address_has_base_prefix(address, &format!(".ibc_relayer_addresses[{i}]"))?; } - if let Some(connect) = &self.connect { - for (i, address) in connect + if let Some(price_feed) = &self.price_feed { + for (i, address) in price_feed .market_map .params .market_authorities @@ -283,7 +283,7 @@ impl GenesisAppState { )?; } self.ensure_address_has_base_prefix( - &connect.market_map.params.admin, + &price_feed.market_map.params.admin, ".market_map.params.admin", )?; } @@ -314,7 +314,7 @@ impl Protobuf for GenesisAppState { ibc_parameters, allowed_fee_assets, fees, - connect, + price_feed, } = raw; let address_prefixes = address_prefixes .as_ref() @@ -376,8 +376,8 @@ impl Protobuf for GenesisAppState { .ok_or_else(|| Self::Error::field_not_set("fees")) .and_then(|fees| GenesisFees::try_from_raw_ref(fees).map_err(Self::Error::fees))?; - let connect = if let Some(connect) = connect { - Some(ConnectGenesis::try_from_raw_ref(connect).map_err(Self::Error::connect)?) + let price_feed = if let Some(price_feed) = price_feed { + Some(PriceFeedGenesis::try_from_raw_ref(price_feed).map_err(Self::Error::price_feed)?) } else { None }; @@ -393,7 +393,7 @@ impl Protobuf for GenesisAppState { ibc_parameters, allowed_fee_assets, fees, - connect, + price_feed, }; this.ensure_all_addresses_have_base_prefix() .map_err(Self::Error::address_does_not_match_base)?; @@ -412,7 +412,7 @@ impl Protobuf for GenesisAppState { ibc_parameters, allowed_fee_assets, fees, - connect, + price_feed, } = self; Self::Raw { address_prefixes: Some(address_prefixes.to_raw()), @@ -427,7 +427,7 @@ impl Protobuf for GenesisAppState { ibc_parameters: Some(ibc_parameters.to_raw()), allowed_fee_assets: allowed_fee_assets.iter().map(ToString::to_string).collect(), fees: Some(fees.to_raw()), - connect: connect.as_ref().map(ConnectGenesis::to_raw), + price_feed: price_feed.as_ref().map(PriceFeedGenesis::to_raw), } } } @@ -511,8 +511,8 @@ impl GenesisAppStateError { }) } - fn connect(source: ConnectGenesisError) -> Self { - Self(GenesisAppStateErrorKind::Connect { + fn price_feed(source: PriceFeedGenesisError) -> Self { + Self(GenesisAppStateErrorKind::PriceFeed { source, }) } @@ -543,8 +543,8 @@ enum GenesisAppStateErrorKind { FieldNotSet { name: &'static str }, #[error("`native_asset_base_denomination` field was invalid")] NativeAssetBaseDenomination { source: ParseTracePrefixedError }, - #[error("`connect` field was invalid")] - Connect { source: ConnectGenesisError }, + #[error("`price_feed` field was invalid")] + PriceFeed { source: PriceFeedGenesisError }, } #[derive(Debug, thiserror::Error)] @@ -997,7 +997,7 @@ mod tests { use super::*; use crate::{ - connect::{ + oracles::price_feed::{ market_map::v2::{ MarketMap, Params, @@ -1042,7 +1042,7 @@ mod tests { } fn genesis_state_markets() -> MarketMap { - use crate::connect::{ + use crate::oracles::price_feed::{ market_map::v2::{ Market, MarketMap, @@ -1083,7 +1083,7 @@ mod tests { } fn proto_genesis_state() -> raw::GenesisAppState { - use crate::connect::{ + use crate::oracles::price_feed::{ oracle::v2::{ CurrencyPairGenesis, QuotePrice, @@ -1147,8 +1147,8 @@ mod tests { FeeComponents::::new(0, 0).to_raw(), ), }), - connect: Some( - ConnectGenesis { + price_feed: Some( + PriceFeedGenesis { market_map: market_map::v2::GenesisState { market_map: genesis_state_markets(), last_updated: 0, @@ -1237,9 +1237,9 @@ mod tests { ); assert_bad_prefix( raw::GenesisAppState { - connect: { - let mut connect = proto_genesis_state().connect; - connect + price_feed: { + let mut price_feed = proto_genesis_state().price_feed; + price_feed .as_mut() .unwrap() .market_map @@ -1249,7 +1249,7 @@ mod tests { .as_mut() .unwrap() .market_authorities[0] = mallory().to_string(); - connect + price_feed }, ..proto_genesis_state() }, diff --git a/crates/astria-core/src/protocol/mod.rs b/crates/astria-core/src/protocol/mod.rs index 629cd75cdb..120bb9b177 100644 --- a/crates/astria-core/src/protocol/mod.rs +++ b/crates/astria-core/src/protocol/mod.rs @@ -10,10 +10,10 @@ pub mod abci; pub mod account; pub mod asset; pub mod bridge; -pub mod connect; pub mod fees; pub mod genesis; pub mod memos; +pub mod price_feed; pub mod transaction; #[cfg(any(feature = "test-utils", test))] diff --git a/crates/astria-core/src/protocol/connect.rs b/crates/astria-core/src/protocol/price_feed.rs similarity index 98% rename from crates/astria-core/src/protocol/connect.rs rename to crates/astria-core/src/protocol/price_feed.rs index 5a7c194107..777094263b 100644 --- a/crates/astria-core/src/protocol/connect.rs +++ b/crates/astria-core/src/protocol/price_feed.rs @@ -6,15 +6,15 @@ pub mod v1 { }; use crate::{ - connect::types::v2::{ + generated::{ + astria::protocol::price_feed::v1 as raw, + astria_vendored, + }, + oracles::price_feed::types::v2::{ CurrencyPair, CurrencyPairError, CurrencyPairId, }, - generated::{ - astria::protocol::connect::v1 as raw, - astria_vendored, - }, }; impl From diff --git a/crates/astria-core/src/protocol/test_utils.rs b/crates/astria-core/src/protocol/test_utils.rs index 988bafc8a8..c705a919c7 100644 --- a/crates/astria-core/src/protocol/test_utils.rs +++ b/crates/astria-core/src/protocol/test_utils.rs @@ -22,7 +22,7 @@ use super::{ use crate::{ crypto::SigningKey, generated::{ - connect::{ + price_feed::{ marketmap::v2::{ GenesisState as RawMarketMapGenesisState, Market as RawMarket, @@ -38,15 +38,15 @@ use crate::{ }, types::v2::CurrencyPair as RawCurrencyPair, }, - protocol::genesis::v1::ConnectGenesis as RawConnectGenesis, + protocol::genesis::v1::PriceFeedGenesis as RawPriceFeedGenesis, }, primitive::v1::{ derive_merkle_tree_from_rollup_txs, RollupId, }, protocol::{ - connect::v1::ExtendedCommitInfoWithCurrencyPairMapping, - genesis::v1::ConnectGenesis, + genesis::v1::PriceFeedGenesis, + price_feed::v1::ExtendedCommitInfoWithCurrencyPairMapping, transaction::v1::TransactionBody, }, sequencerblock::v1::{ @@ -308,7 +308,7 @@ pub fn minimal_extended_commit_info_bytes() -> Bytes { } #[must_use] -pub fn dummy_connect_genesis() -> ConnectGenesis { +pub fn dummy_price_feed_genesis() -> PriceFeedGenesis { let mut markets = BTreeMap::new(); markets.insert( "BTC/USD".to_string(), @@ -355,7 +355,7 @@ pub fn dummy_connect_genesis() -> ConnectGenesis { }, ); - let connect_genesis = RawConnectGenesis { + let price_feed_genesis = RawPriceFeedGenesis { market_map: Some(RawMarketMapGenesisState { market_map: Some(RawMarketMap { markets, @@ -404,7 +404,7 @@ pub fn dummy_connect_genesis() -> ConnectGenesis { next_id: 2, }), }; - ConnectGenesis::try_from_raw(connect_genesis).unwrap() + PriceFeedGenesis::try_from_raw(price_feed_genesis).unwrap() } fn alice() -> Address { diff --git a/crates/astria-core/src/protocol/transaction/v1/action/mod.rs b/crates/astria-core/src/protocol/transaction/v1/action/mod.rs index 95d6a007d6..883c7985ee 100644 --- a/crates/astria-core/src/protocol/transaction/v1/action/mod.rs +++ b/crates/astria-core/src/protocol/transaction/v1/action/mod.rs @@ -11,7 +11,7 @@ use prost::Name as _; use super::raw; use crate::{ - connect::types::v2::{ + oracles::price_feed::types::v2::{ CurrencyPair, CurrencyPairError, }, diff --git a/crates/astria-core/src/sequencerblock/v1/block/mod.rs b/crates/astria-core/src/sequencerblock/v1/block/mod.rs index 2287c607ca..9c05e9e0a7 100644 --- a/crates/astria-core/src/sequencerblock/v1/block/mod.rs +++ b/crates/astria-core/src/sequencerblock/v1/block/mod.rs @@ -34,14 +34,14 @@ use super::{ raw, }; use crate::{ - connect::types::v2::{ - CurrencyPair, - CurrencyPairError, - }, generated::protocol::{ - connect::v1::ExtendedCommitInfoWithCurrencyPairMapping as RawExtendedCommitInfoWithCurrencyPairMapping, + price_feed::v1::ExtendedCommitInfoWithCurrencyPairMapping as RawExtendedCommitInfoWithCurrencyPairMapping, transaction::v1::Transaction as RawTransaction, }, + oracles::price_feed::types::v2::{ + CurrencyPair, + CurrencyPairError, + }, primitive::v1::{ asset, derive_merkle_tree_from_rollup_txs, @@ -53,7 +53,7 @@ use crate::{ TransactionIdError, }, protocol::{ - connect::v1::{ + price_feed::v1::{ ExtendedCommitInfoWithCurrencyPairMapping, ExtendedCommitInfoWithCurrencyPairMappingError, }, @@ -2356,7 +2356,7 @@ impl ExtendedCommitInfoWithProof { #[derive(Debug, Clone, PartialEq)] pub struct Price { currency_pair: CurrencyPair, - price: crate::connect::types::v2::Price, + price: crate::oracles::price_feed::types::v2::Price, decimals: u64, } @@ -2364,7 +2364,7 @@ impl Price { #[must_use] pub fn new( currency_pair: CurrencyPair, - price: crate::connect::types::v2::Price, + price: crate::oracles::price_feed::types::v2::Price, decimals: u64, ) -> Self { Self { @@ -2380,7 +2380,7 @@ impl Price { } #[must_use] - pub fn price(&self) -> crate::connect::types::v2::Price { + pub fn price(&self) -> crate::oracles::price_feed::types::v2::Price { self.price } @@ -2420,7 +2420,7 @@ impl Price { }; let currency_pair = CurrencyPair::try_from_raw(currency_pair).map_err(PriceError::currency)?; - let price = crate::connect::types::v2::Price::new( + let price = crate::oracles::price_feed::types::v2::Price::new( price.ok_or(PriceError::field_not_set("price"))?.into(), ); Ok(Self { @@ -2454,11 +2454,11 @@ enum PriceErrorKind { } #[derive(Debug, Clone, PartialEq)] -pub struct OracleData { +pub struct PriceFeedData { prices: Vec, } -impl OracleData { +impl PriceFeedData { #[must_use] pub fn new(prices: Vec) -> Self { Self { @@ -2472,26 +2472,26 @@ impl OracleData { } #[must_use] - pub fn into_raw(self) -> raw::OracleData { - raw::OracleData { + pub fn into_raw(self) -> raw::PriceFeedData { + raw::PriceFeedData { prices: self.prices.into_iter().map(Price::into_raw).collect(), } } - /// Attempts to transform the oracle data from its raw representation. + /// Attempts to transform the price feed data from its raw representation. /// /// # Errors /// /// - if the prices are unset - pub fn try_from_raw(raw: raw::OracleData) -> Result { - let raw::OracleData { + pub fn try_from_raw(raw: raw::PriceFeedData) -> Result { + let raw::PriceFeedData { prices, } = raw; let prices = prices .into_iter() .map(Price::try_from_raw) .collect::>() - .map_err(OracleDataError::prices)?; + .map_err(PriceFeedDataError::prices)?; Ok(Self { prices, }) @@ -2500,16 +2500,16 @@ impl OracleData { #[derive(Debug, thiserror::Error)] #[error(transparent)] -pub struct OracleDataError(OracleDataErrorKind); +pub struct PriceFeedDataError(PriceFeedDataErrorKind); -impl OracleDataError { +impl PriceFeedDataError { fn prices(source: PriceError) -> Self { - Self(OracleDataErrorKind::Prices(source)) + Self(PriceFeedDataErrorKind::Prices(source)) } } #[derive(Debug, thiserror::Error)] -enum OracleDataErrorKind { +enum PriceFeedDataErrorKind { #[error("failed to validate `prices` field")] Prices(#[source] PriceError), } @@ -2517,7 +2517,8 @@ enum OracleDataErrorKind { /// A piece of data that is sent to a rollup execution node. /// /// The data can be either sequenced data (originating from a [`RollupDataSubmission`] -/// action submitted by a user) or a [`Deposit`] (originating from a [`BridgeLock`] action). +/// action submitted by a user), a [`Deposit`] (originating from a [`BridgeLock`] action), or +/// [`PriceFeedData`] (originating from the price feed oracle). /// /// The rollup node receives this type as opaque, protobuf-encoded bytes from conductor, /// and must decode it accordingly. @@ -2525,7 +2526,7 @@ enum OracleDataErrorKind { pub enum RollupData { SequencedData(Bytes), Deposit(Box), - OracleData(Box), + PriceFeedData(Box), } impl RollupData { @@ -2538,8 +2539,10 @@ impl RollupData { Self::Deposit(deposit) => raw::RollupData { value: Some(raw::rollup_data::Value::Deposit(deposit.into_raw())), }, - Self::OracleData(oracle_data) => raw::RollupData { - value: Some(raw::rollup_data::Value::OracleData(oracle_data.into_raw())), + Self::PriceFeedData(price_feed_data) => raw::RollupData { + value: Some(raw::rollup_data::Value::PriceFeedData( + price_feed_data.into_raw(), + )), }, } } @@ -2560,11 +2563,11 @@ impl RollupData { .map(Box::new) .map(Self::Deposit) .map_err(RollupDataError::deposit), - Some(raw::rollup_data::Value::OracleData(oracle_data)) => { - Ok(OracleData::try_from_raw(oracle_data) + Some(raw::rollup_data::Value::PriceFeedData(price_feed_data)) => { + Ok(PriceFeedData::try_from_raw(price_feed_data) .map(Box::new) - .map(Self::OracleData) - .map_err(RollupDataError::oracle_data)?) + .map(Self::PriceFeedData) + .map_err(RollupDataError::price_feed_data)?) } None => Err(RollupDataError::field_not_set("data")), } @@ -2584,8 +2587,8 @@ impl RollupDataError { Self(RollupDataErrorKind::Deposit(source)) } - fn oracle_data(source: OracleDataError) -> Self { - Self(RollupDataErrorKind::OracleData(source)) + fn price_feed_data(source: PriceFeedDataError) -> Self { + Self(RollupDataErrorKind::PriceFeedData(source)) } } @@ -2595,6 +2598,6 @@ enum RollupDataErrorKind { FieldNotSet(&'static str), #[error("failed to validate `deposit` field")] Deposit(#[source] DepositError), - #[error("failed to validate `oracle_data` field")] - OracleData(#[source] OracleDataError), + #[error("failed to validate `price_feed_data` field")] + PriceFeedData(#[source] PriceFeedDataError), } diff --git a/crates/astria-core/src/sequencerblock/v1/celestia.rs b/crates/astria-core/src/sequencerblock/v1/celestia.rs index 98a9d98fd3..b97e3a3b37 100644 --- a/crates/astria-core/src/sequencerblock/v1/celestia.rs +++ b/crates/astria-core/src/sequencerblock/v1/celestia.rs @@ -18,7 +18,7 @@ use super::{ RollupId, }; use crate::{ - protocol::connect::v1::ExtendedCommitInfoWithCurrencyPairMapping, + protocol::price_feed::v1::ExtendedCommitInfoWithCurrencyPairMapping, sequencerblock::v1::block::{ ExtendedCommitInfoError, UpgradeChangeHashesError, diff --git a/crates/astria-core/src/upgrades/test_utils.rs b/crates/astria-core/src/upgrades/test_utils.rs index aa6e51bb8a..9531f50df7 100644 --- a/crates/astria-core/src/upgrades/test_utils.rs +++ b/crates/astria-core/src/upgrades/test_utils.rs @@ -1,7 +1,7 @@ use super::v1::Upgrades; use crate::{ generated::upgrades::v1 as raw, - protocol::test_utils::dummy_connect_genesis, + protocol::test_utils::dummy_price_feed_genesis, Protobuf as _, }; @@ -36,8 +36,8 @@ impl UpgradesBuilder { activation_height, app_version: 2, }), - connect_oracle_change: Some(raw::upgrade1::ConnectOracleChange { - genesis: Some(dummy_connect_genesis().into_raw()), + price_feed_change: Some(raw::upgrade1::PriceFeedChange { + genesis: Some(dummy_price_feed_genesis().into_raw()), }), validator_update_action_change: Some(raw::upgrade1::ValidatorUpdateActionChange {}), }); diff --git a/crates/astria-core/src/upgrades/v1/upgrade1.rs b/crates/astria-core/src/upgrades/v1/upgrade1.rs index 160ff57533..d0d27c16af 100644 --- a/crates/astria-core/src/upgrades/v1/upgrade1.rs +++ b/crates/astria-core/src/upgrades/v1/upgrade1.rs @@ -10,15 +10,15 @@ use super::{ use crate::{ generated::upgrades::v1::{ upgrade1::{ - ConnectOracleChange as RawConnectOracleChange, + PriceFeedChange as RawPriceFeedChange, ValidatorUpdateActionChange as RawValidatorUpdateActionChange, }, BaseUpgradeInfo as RawBaseUpgradeInfo, Upgrade1 as RawUpgrade1, }, protocol::genesis::v1::{ - ConnectGenesis, - ConnectGenesisError, + PriceFeedGenesis, + PriceFeedGenesisError, }, Protobuf, }; @@ -27,7 +27,7 @@ use crate::{ pub struct Upgrade1 { activation_height: u64, app_version: u64, - connect_oracle_change: ConnectOracleChange, + price_feed_change: PriceFeedChange, validator_update_action_change: ValidatorUpdateActionChange, } @@ -45,8 +45,8 @@ impl Upgrade1 { } #[must_use] - pub fn connect_oracle_change(&self) -> &ConnectOracleChange { - &self.connect_oracle_change + pub fn price_feed_change(&self) -> &PriceFeedChange { + &self.price_feed_change } #[must_use] @@ -55,7 +55,7 @@ impl Upgrade1 { } pub fn changes(&self) -> impl Iterator { - Some(&self.connect_oracle_change as &dyn Change) + Some(&self.price_feed_change as &dyn Change) .into_iter() .chain(Some(&self.validator_update_action_change as &dyn Change)) } @@ -75,24 +75,24 @@ impl Protobuf for Upgrade1 { .ok_or_else(Error::no_base_info)? .clone(); - let connect_oracle_change = raw - .connect_oracle_change + let price_feed_change = raw + .price_feed_change .as_ref() - .ok_or_else(Error::no_connect_oracle_change)?; + .ok_or_else(Error::no_price_feed_change)?; - let genesis = connect_oracle_change + let genesis = price_feed_change .genesis .as_ref() - .ok_or_else(Error::no_connect_genesis) + .ok_or_else(Error::no_price_feed_genesis) .and_then(|raw_genesis| { - ConnectGenesis::try_from_raw_ref(raw_genesis).map_err(Error::connect_genesis) + PriceFeedGenesis::try_from_raw_ref(raw_genesis).map_err(Error::price_feed_genesis) })?; if raw.validator_update_action_change.is_none() { return Err(Error::no_validator_update_action_change()); } - let connect_oracle_change = ConnectOracleChange { + let price_feed_change = PriceFeedChange { activation_height, app_version, genesis: Arc::new(genesis), @@ -106,7 +106,7 @@ impl Protobuf for Upgrade1 { Ok(Self { activation_height, app_version, - connect_oracle_change, + price_feed_change, validator_update_action_change, }) } @@ -116,39 +116,39 @@ impl Protobuf for Upgrade1 { activation_height: self.activation_height, app_version: self.app_version, }); - let connect_oracle_change = Some(RawConnectOracleChange { - genesis: Some(self.connect_oracle_change.genesis.to_raw()), + let price_feed_change = Some(RawPriceFeedChange { + genesis: Some(self.price_feed_change.genesis.to_raw()), }); RawUpgrade1 { base_info, - connect_oracle_change, + price_feed_change, validator_update_action_change: Some(RawValidatorUpdateActionChange {}), } } } -/// This change enables vote extensions and starts to provide price feed data from the Connect -/// Oracle sidecar (if enabled) via the vote extensions. +/// This change enables vote extensions and starts to provide price feed data from the price feed +/// (if enabled) via the vote extensions. /// /// The vote extensions are enabled in the block immediately after `activation_height`, meaning the /// price feed data is available no earlier than two blocks after `activation_height`. #[derive(Clone, Debug, BorshSerialize)] -pub struct ConnectOracleChange { +pub struct PriceFeedChange { activation_height: u64, app_version: u64, - genesis: Arc, + genesis: Arc, } -impl ConnectOracleChange { - pub const NAME: ChangeName = ChangeName::new("connect_oracle_change"); +impl PriceFeedChange { + pub const NAME: ChangeName = ChangeName::new("price_feed_change"); #[must_use] - pub fn genesis(&self) -> &Arc { + pub fn genesis(&self) -> &Arc { &self.genesis } } -impl Change for ConnectOracleChange { +impl Change for PriceFeedChange { fn name(&self) -> ChangeName { Self::NAME.clone() } @@ -187,7 +187,7 @@ impl Change for ValidatorUpdateActionChange { } } -/// An error when transforming a [`RawConnectOracleUpgrade`] into a [`ConnectOracleChange`]. +/// An error when transforming a [`RawPriceFeedUpgrade`] into a [`PriceFeedChange`]. #[derive(Debug, thiserror::Error)] #[error(transparent)] pub struct Error(ErrorKind); @@ -197,20 +197,20 @@ impl Error { Self(ErrorKind::FieldNotSet("base_info")) } - fn no_connect_oracle_change() -> Self { - Self(ErrorKind::FieldNotSet("connect_oracle_change")) + fn no_price_feed_change() -> Self { + Self(ErrorKind::FieldNotSet("price_feed_change")) } fn no_validator_update_action_change() -> Self { Self(ErrorKind::FieldNotSet("validator_update_action_change")) } - fn no_connect_genesis() -> Self { - Self(ErrorKind::FieldNotSet("connect_oracle_change.genesis")) + fn no_price_feed_genesis() -> Self { + Self(ErrorKind::FieldNotSet("price_feed_change.genesis")) } - fn connect_genesis(source: ConnectGenesisError) -> Self { - Self(ErrorKind::ConnectGenesis { + fn price_feed_genesis(source: PriceFeedGenesisError) -> Self { + Self(ErrorKind::PriceFeedGenesis { source, }) } @@ -220,6 +220,6 @@ impl Error { enum ErrorKind { #[error("`{0}` field was not set")] FieldNotSet(&'static str), - #[error("`connect_oracle_change.genesis` field was invalid")] - ConnectGenesis { source: ConnectGenesisError }, + #[error("`price_feed_change.genesis` field was invalid")] + PriceFeedGenesis { source: PriceFeedGenesisError }, } diff --git a/crates/astria-sequencer-utils/src/blob_parser.rs b/crates/astria-sequencer-utils/src/blob_parser.rs index 3334005ee8..0e3990104f 100644 --- a/crates/astria-sequencer-utils/src/blob_parser.rs +++ b/crates/astria-sequencer-utils/src/blob_parser.rs @@ -16,7 +16,7 @@ use astria_core::{ generated::astria::sequencerblock::v1::{ rollup_data::Value as RawRollupDataValue, Deposit as RawDeposit, - OracleData as RawOracleData, + PriceFeedData as RawPriceFeedData, RollupData as RawRollupData, SubmittedMetadata as RawSubmittedMetadata, SubmittedMetadataList as RawSubmittedMetadataList, @@ -28,8 +28,8 @@ use astria_core::{ block::{ Deposit, DepositError, - OracleData, - OracleDataError, + PriceFeedData, + PriceFeedDataError, SequencerBlockHeader, }, celestia::{ @@ -568,17 +568,17 @@ impl Display for PrintableDeposit { } #[derive(Serialize, Debug)] -struct PrintableOracleData { +struct PrintablePriceFeedData { prices: Vec<(String, u128, u64)>, } -impl TryFrom<&RawOracleData> for PrintableOracleData { - type Error = OracleDataError; +impl TryFrom<&RawPriceFeedData> for PrintablePriceFeedData { + type Error = PriceFeedDataError; - fn try_from(value: &RawOracleData) -> Result { - let oracle_data = OracleData::try_from_raw(value.clone())?; - Ok(PrintableOracleData { - prices: oracle_data + fn try_from(value: &RawPriceFeedData) -> Result { + let price_feed_data = PriceFeedData::try_from_raw(value.clone())?; + Ok(PrintablePriceFeedData { + prices: price_feed_data .prices() .iter() .map(|price| { @@ -593,7 +593,7 @@ impl TryFrom<&RawOracleData> for PrintableOracleData { } } -impl Display for PrintableOracleData { +impl Display for PrintablePriceFeedData { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { for (currency_pair, price, decimals) in &self.prices { colored_label_ln(f, "price")?; @@ -612,8 +612,8 @@ enum RollupDataDetails { Transaction(RollupTransaction), #[serde(rename = "deposit")] Deposit(PrintableDeposit), - #[serde(rename = "oracle_data")] - OracleData(PrintableOracleData), + #[serde(rename = "price_feed_data")] + PriceFeedData(PrintablePriceFeedData), /// Tx doesn't decode as `RawRollupData`. Wrapped value is base-64-encoded input data. #[serde(rename = "not_tx_or_deposit")] NotTxOrDeposit(String), @@ -628,10 +628,11 @@ enum RollupDataDetails { /// Wrapped value is decoding error and the debug contents of the raw (protobuf) deposit. #[serde(rename = "unparseable_deposit")] UnparseableDeposit(String), - /// Tx parses as `RawRollupData::OracleData`, but its value doesn't decode as a `OracleData`. - /// Wrapped value is decoding error and the debug contents of the raw (protobuf) oracle data. - #[serde(rename = "unparseable_oracle_data")] - UnparseableOracleData(String), + /// Tx parses as `RawRollupData::PriceFeedData`, but its value doesn't decode as a + /// `PriceFeedData`. Wrapped value is decoding error and the debug contents of the raw + /// (protobuf) price feed data. + #[serde(rename = "unparseable_price_feed_data")] + UnparseablePriceFeedData(String), } impl From<&Vec> for RollupDataDetails { @@ -655,13 +656,13 @@ impl From<&Vec> for RollupDataDetails { } } } - Some(RawRollupDataValue::OracleData(raw_oracle_data)) => { - match PrintableOracleData::try_from(&raw_oracle_data) { - Ok(printable_oracle_data) => { - RollupDataDetails::OracleData(printable_oracle_data) + Some(RawRollupDataValue::PriceFeedData(raw_price_feed_data)) => { + match PrintablePriceFeedData::try_from(&raw_price_feed_data) { + Ok(printable_price_feed_data) => { + RollupDataDetails::PriceFeedData(printable_price_feed_data) } - Err(error) => RollupDataDetails::UnparseableOracleData(format!( - "{raw_oracle_data:?}: {error}" + Err(error) => RollupDataDetails::UnparseablePriceFeedData(format!( + "{raw_price_feed_data:?}: {error}" )), } } @@ -680,7 +681,7 @@ impl Display for RollupDataDetails { colored_label_ln(f, "deposit")?; write!(indent(f), "{deposit}") } - RollupDataDetails::OracleData(oracle_data) => { + RollupDataDetails::PriceFeedData(oracle_data) => { colored_label_ln(f, "oracle data")?; write!(indent(f), "{oracle_data}") } @@ -694,8 +695,8 @@ impl Display for RollupDataDetails { RollupDataDetails::UnparseableDeposit(error) => { colored(f, "unparseable deposit", error) } - RollupDataDetails::UnparseableOracleData(error) => { - colored(f, "unparseable oracle data", error) + RollupDataDetails::UnparseablePriceFeedData(error) => { + colored(f, "unparseable price feed data", error) } } } diff --git a/crates/astria-sequencer-utils/src/genesis_example.rs b/crates/astria-sequencer-utils/src/genesis_example.rs index ecffbb4d4b..8092d2fae8 100644 --- a/crates/astria-sequencer-utils/src/genesis_example.rs +++ b/crates/astria-sequencer-utils/src/genesis_example.rs @@ -11,7 +11,7 @@ use astria_core::{ GenesisFees, IbcParameters, }, - connect::{ + price_feed::{ marketmap, marketmap::v2::{ Market, @@ -85,7 +85,7 @@ fn charlie() -> Address { } fn genesis_state_markets() -> MarketMap { - use astria_core::generated::connect::marketmap::v2::{ + use astria_core::generated::price_feed::marketmap::v2::{ ProviderConfig, Ticker, }; @@ -177,10 +177,10 @@ fn proto_genesis_state() -> astria_core::generated::astria::protocol::genesis::v outbound_ics20_transfers_enabled: true, }), allowed_fee_assets: vec!["nria".parse().unwrap()], - connect: Some( - astria_core::generated::protocol::genesis::v1::ConnectGenesis { + price_feed: Some( + astria_core::generated::protocol::genesis::v1::PriceFeedGenesis { market_map: Some( - astria_core::generated::connect::marketmap::v2::GenesisState { + astria_core::generated::price_feed::marketmap::v2::GenesisState { market_map: Some(genesis_state_markets()), last_updated: 0, params: Some(marketmap::v2::Params { diff --git a/crates/astria-sequencer/local.env.example b/crates/astria-sequencer/local.env.example index e2c0a0f109..a93902fbac 100644 --- a/crates/astria-sequencer/local.env.example +++ b/crates/astria-sequencer/local.env.example @@ -39,15 +39,17 @@ ASTRIA_SEQUENCER_UPGRADES_FILEPATH="/path/to/upgrades.json" # The address of the CometBFT RPC endpoint for this sequencer. ASTRIA_SEQUENCER_COMETBFT_RPC_ADDR="http://127.0.0.1:26657" -# If the oracle is disabled. If false, the oracle_grpc_addr must be set. +# If true, the price feed is disabled. +# If false, `ASTRIA_SEQUENCER_PRICE_FEED_GRPC_ADDR` and +# `ASTRIA_SEQUENCER_PRICE_FEED_CLIENT_TIMEOUT_MILLISECONDS` must be set. # Should be false for validator nodes and true for non-validator nodes. -ASTRIA_SEQUENCER_NO_ORACLE=true +ASTRIA_SEQUENCER_NO_PRICE_FEED=true -# The gRPC endpoint for the oracle sidecar. -ASTRIA_SEQUENCER_ORACLE_GRPC_ADDR="http://127.0.0.1:8081" +# The gRPC endpoint for the price feed oracle sidecar. +ASTRIA_SEQUENCER_PRICE_FEED_GRPC_ADDR="http://127.0.0.1:8081" -# The timeout for the responses from the oracle sidecar in milliseconds. -ASTRIA_SEQUENCER_ORACLE_CLIENT_TIMEOUT_MILLISECONDS=1000 +# The timeout for the responses from the price feed oracle sidecar in milliseconds. +ASTRIA_SEQUENCER_PRICE_FEED_CLIENT_TIMEOUT_MILLISECONDS=1000 # If set to any non-empty value removes ANSI escape characters from the pretty # printed output. Note that this does nothing unless `ASTRIA_SEQUENCER_PRETTY_PRINT` diff --git a/crates/astria-sequencer/src/action_handler/impls/add_currency_pairs.rs b/crates/astria-sequencer/src/action_handler/impls/add_currency_pairs.rs index 048bdc86f3..6f48d34830 100644 --- a/crates/astria-sequencer/src/action_handler/impls/add_currency_pairs.rs +++ b/crates/astria-sequencer/src/action_handler/impls/add_currency_pairs.rs @@ -1,5 +1,5 @@ use astria_core::{ - connect::{ + oracles::price_feed::{ oracle::v2::CurrencyPairState, types::v2::CurrencyPairNonce, }, @@ -17,7 +17,7 @@ use tracing::debug; use crate::{ action_handler::ActionHandler, - connect::{ + oracles::price_feed::{ market_map::state_ext::StateReadExt as _, oracle::state_ext::{ StateReadExt as _, @@ -98,7 +98,7 @@ impl ActionHandler for AddCurrencyPairs { #[cfg(test)] mod test { use astria_core::{ - connect::{ + oracles::price_feed::{ market_map::v2::Params, oracle::v2::CurrencyPairState, types::v2::CurrencyPairId, @@ -112,7 +112,7 @@ mod test { use crate::{ app::test_utils::get_alice_signing_key, benchmark_and_test_utils::astria_address, - connect::market_map::state_ext::StateWriteExt as _, + oracles::price_feed::market_map::state_ext::StateWriteExt as _, transaction::{ StateWriteExt, TransactionContext, diff --git a/crates/astria-sequencer/src/action_handler/impls/remove_currency_pairs.rs b/crates/astria-sequencer/src/action_handler/impls/remove_currency_pairs.rs index b717c7378a..5d59d9c72f 100644 --- a/crates/astria-sequencer/src/action_handler/impls/remove_currency_pairs.rs +++ b/crates/astria-sequencer/src/action_handler/impls/remove_currency_pairs.rs @@ -10,7 +10,7 @@ use cnidarium::StateWrite; use crate::{ action_handler::ActionHandler, - connect::{ + oracles::price_feed::{ market_map::state_ext::StateReadExt as _, oracle::state_ext::{ StateReadExt as _, @@ -74,7 +74,7 @@ impl ActionHandler for RemoveCurrencyPairs { #[cfg(test)] mod test { use astria_core::{ - connect::{ + oracles::price_feed::{ market_map::v2::Params, oracle::v2::CurrencyPairState, types::v2::{ @@ -92,7 +92,7 @@ mod test { use crate::{ app::test_utils::get_alice_signing_key, benchmark_and_test_utils::astria_address, - connect::{ + oracles::price_feed::{ market_map::state_ext::StateWriteExt as _, oracle::state_ext::StateWriteExt as _, }, diff --git a/crates/astria-sequencer/src/app/benchmark_and_test_utils.rs b/crates/astria-sequencer/src/app/benchmark_and_test_utils.rs index 3ceeb24f27..b6f9c83e3a 100644 --- a/crates/astria-sequencer/src/app/benchmark_and_test_utils.rs +++ b/crates/astria-sequencer/src/app/benchmark_and_test_utils.rs @@ -12,7 +12,7 @@ use astria_core::{ AddressPrefixes, GenesisAppState, }, - test_utils::dummy_connect_genesis, + test_utils::dummy_price_feed_genesis, transaction::v1::action::{ AddCurrencyPairs, BridgeLock, @@ -119,7 +119,7 @@ pub(crate) fn proto_genesis_state() }), allowed_fee_assets: vec![nria().to_string()], fees: Some(default_fees().to_raw()), - connect: Some(dummy_connect_genesis().into_raw()), + price_feed: Some(dummy_price_feed_genesis().into_raw()), } } diff --git a/crates/astria-sequencer/src/app/mod.rs b/crates/astria-sequencer/src/app/mod.rs index ba2940b2fb..0bd382902e 100644 --- a/crates/astria-sequencer/src/app/mod.rs +++ b/crates/astria-sequencer/src/app/mod.rs @@ -23,8 +23,8 @@ use astria_core::{ primitive::v1::TRANSACTION_ID_LEN, protocol::{ abci::AbciErrorCode, - connect::v1::ExtendedCommitInfoWithCurrencyPairMapping, genesis::v1::GenesisAppState, + price_feed::v1::ExtendedCommitInfoWithCurrencyPairMapping, transaction::v1::{ action::{ group::Group, @@ -128,10 +128,6 @@ use crate::{ StateWriteExt as _, }, component::Component as _, - connect::{ - market_map::component::MarketMapComponent, - oracle::component::OracleComponent, - }, fees::{ component::FeesComponent, StateReadExt as _, @@ -143,6 +139,10 @@ use crate::{ RemovalReason, }, metrics::Metrics, + oracles::price_feed::{ + market_map::component::MarketMapComponent, + oracle::component::OracleComponent, + }, proposal::{ block_size_constraints::BlockSizeConstraints, commitment::generate_rollup_datas_commitment, @@ -1597,7 +1597,7 @@ impl App { reason = "will become refutable once we have more than one upgrade variant" )] if let Upgrade::Upgrade1(upgrade_1) = upgrade { - let genesis_state = upgrade_1.connect_oracle_change().genesis(); + let genesis_state = upgrade_1.price_feed_change().genesis(); MarketMapComponent::handle_genesis(&mut delta_delta, genesis_state.market_map()) .wrap_err("failed to handle market map genesis")?; info!("handled market map genesis"); diff --git a/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_at_genesis.snap b/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_at_genesis.snap index 7967df2f7a..47985bab3f 100644 --- a/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_at_genesis.snap +++ b/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_at_genesis.snap @@ -3,36 +3,36 @@ source: crates/astria-sequencer/src/app/tests_breaking_changes.rs expression: app.app_hash.as_bytes() --- [ - 226, - 5, - 162, - 168, - 226, + 106, + 251, + 42, + 236, + 89, + 91, + 119, + 176, + 179, + 244, + 230, + 126, + 243, + 88, + 90, + 154, + 73, + 37, + 99, + 233, + 224, 115, - 210, - 97, - 29, - 58, - 131, - 95, - 82, - 98, - 129, - 70, - 81, - 155, - 226, - 120, - 201, - 217, - 69, - 4, - 250, - 211, - 63, - 228, - 4, - 249, - 200, - 218 + 154, + 118, + 204, + 5, + 109, + 128, + 242, + 180, + 207, + 255 ] diff --git a/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_execute_every_action.snap b/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_execute_every_action.snap index 6de2e6727a..bc1bcce99c 100644 --- a/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_execute_every_action.snap +++ b/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_execute_every_action.snap @@ -3,36 +3,36 @@ source: crates/astria-sequencer/src/app/tests_breaking_changes.rs expression: app.app_hash.as_bytes() --- [ - 105, - 26, - 89, - 107, - 255, - 52, - 99, - 41, - 47, - 213, - 255, - 252, - 230, - 224, - 228, - 35, - 4, - 109, - 219, - 110, - 255, - 197, - 220, - 16, - 174, - 20, - 152, - 206, + 24, + 23, + 0, + 202, + 102, + 241, + 30, + 19, + 198, + 97, + 222, + 165, + 187, + 38, + 3, + 189, + 195, + 222, + 162, 131, - 138, - 185, - 118 + 52, + 148, + 209, + 49, + 62, + 108, + 159, + 177, + 179, + 177, + 86, + 19 ] diff --git a/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_finalize_block.snap b/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_finalize_block.snap index ce8b2888e2..3ec7ffe909 100644 --- a/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_finalize_block.snap +++ b/crates/astria-sequencer/src/app/snapshots/astria_sequencer__app__tests_breaking_changes__app_hash_finalize_block.snap @@ -3,36 +3,36 @@ source: crates/astria-sequencer/src/app/tests_breaking_changes.rs expression: app.app_hash.as_bytes() --- [ - 97, - 86, - 195, - 64, - 93, - 79, - 45, - 238, - 99, - 185, - 59, - 104, - 33, - 220, - 99, - 247, - 133, - 213, - 160, + 141, + 15, + 211, + 170, + 170, + 186, + 88, 192, - 85, - 227, 8, - 199, - 58, - 188, - 207, - 201, - 112, - 58, - 126, - 201 + 249, + 160, + 198, + 232, + 22, + 230, + 143, + 139, + 13, + 33, + 141, + 60, + 130, + 220, + 38, + 102, + 177, + 77, + 138, + 55, + 44, + 123, + 9 ] diff --git a/crates/astria-sequencer/src/app/test_utils.rs b/crates/astria-sequencer/src/app/test_utils.rs index 681826e2b5..01a370157f 100644 --- a/crates/astria-sequencer/src/app/test_utils.rs +++ b/crates/astria-sequencer/src/app/test_utils.rs @@ -174,7 +174,7 @@ pub(crate) fn transactions_with_extended_commit_info_and_commitments( txs: &[Arc], deposits: Option>>, ) -> Vec { - use astria_core::protocol::connect::v1::ExtendedCommitInfoWithCurrencyPairMapping; + use astria_core::protocol::price_feed::v1::ExtendedCommitInfoWithCurrencyPairMapping; use prost::Message as _; use crate::proposal::commitment::generate_rollup_datas_commitment; diff --git a/crates/astria-sequencer/src/app/tests_app/upgrades.rs b/crates/astria-sequencer/src/app/tests_app/upgrades.rs index 3e4e3cee38..8582ccb202 100644 --- a/crates/astria-sequencer/src/app/tests_app/upgrades.rs +++ b/crates/astria-sequencer/src/app/tests_app/upgrades.rs @@ -1,7 +1,8 @@ use std::sync::Arc; use astria_core::{ - connect::{ + crypto::SigningKey, + oracles::price_feed::{ abci::v2::OracleVoteExtension, oracle::v2::QuotePrice, types::v2::{ @@ -9,9 +10,8 @@ use astria_core::{ Price, }, }, - crypto::SigningKey, protocol::{ - test_utils::dummy_connect_genesis, + test_utils::dummy_price_feed_genesis, transaction::v1::{ action::{ Transfer, @@ -77,7 +77,7 @@ use crate::{ astria_address_from_hex_string, nria, }, - connect::oracle::state_ext::StateReadExt as _, + oracles::price_feed::oracle::state_ext::StateReadExt as _, }; const PROPOSER_SEED: [u8; 32] = [1; 32]; @@ -272,7 +272,7 @@ fn new_finalize_block( } async fn latest_currency_pair_price(storage: Storage, index: usize) -> QuotePrice { - let markets = dummy_connect_genesis() + let markets = dummy_price_feed_genesis() .market_map() .market_map .markets diff --git a/crates/astria-sequencer/src/app/tests_breaking_changes.rs b/crates/astria-sequencer/src/app/tests_breaking_changes.rs index 635e1cf50b..7a2963d054 100644 --- a/crates/astria-sequencer/src/app/tests_breaking_changes.rs +++ b/crates/astria-sequencer/src/app/tests_breaking_changes.rs @@ -16,7 +16,7 @@ use std::{ }; use astria_core::{ - connect::types::v2::CurrencyPair, + oracles::price_feed::types::v2::CurrencyPair, primitive::v1::{ Address, RollupId, diff --git a/crates/astria-sequencer/src/app/tests_execute_transaction.rs b/crates/astria-sequencer/src/app/tests_execute_transaction.rs index 4db4b572dc..55190456a4 100644 --- a/crates/astria-sequencer/src/app/tests_execute_transaction.rs +++ b/crates/astria-sequencer/src/app/tests_execute_transaction.rs @@ -5,8 +5,8 @@ use std::{ }; use astria_core::{ - connect::types::v2::CurrencyPair, crypto::SigningKey, + oracles::price_feed::types::v2::CurrencyPair, primitive::v1::{ asset, Address, @@ -71,12 +71,12 @@ use crate::{ StateReadExt as _, StateWriteExt as _, }, - connect::oracle::state_ext::StateReadExt, fees::{ StateReadExt as _, StateWriteExt as _, }, ibc::StateReadExt as _, + oracles::price_feed::oracle::state_ext::StateReadExt, test_utils::calculate_rollup_data_submission_fee_from_state, utils::create_deposit_event, }; diff --git a/crates/astria-sequencer/src/app/vote_extension.rs b/crates/astria-sequencer/src/app/vote_extension.rs index a304d013da..5974749c36 100644 --- a/crates/astria-sequencer/src/app/vote_extension.rs +++ b/crates/astria-sequencer/src/app/vote_extension.rs @@ -1,7 +1,15 @@ use std::collections::HashSet; use astria_core::{ - connect::{ + crypto::Signature, + generated::price_feed::{ + abci::v2::OracleVoteExtension as RawOracleVoteExtension, + service::v2::{ + oracle_client::OracleClient, + QueryPricesRequest, + }, + }, + oracles::price_feed::{ abci::v2::OracleVoteExtension, oracle::v2::QuotePrice, service::v2::QueryPricesResponse, @@ -10,15 +18,7 @@ use astria_core::{ Price, }, }, - crypto::Signature, - generated::connect::{ - abci::v2::OracleVoteExtension as RawOracleVoteExtension, - service::v2::{ - oracle_client::OracleClient, - QueryPricesRequest, - }, - }, - protocol::connect::v1::{ + protocol::price_feed::v1::{ CurrencyPairInfo, ExtendedCommitInfoWithCurrencyPairMapping, }, @@ -61,7 +61,7 @@ use crate::{ address::StateReadExt as _, app::state_ext::StateReadExt, authority::StateReadExt as _, - connect::oracle::{ + oracles::price_feed::oracle::{ currency_pair_strategy::DefaultCurrencyPairStrategy, state_ext::StateWriteExt, }, @@ -176,7 +176,7 @@ async fn transform_oracle_service_prices( state: &S, rsp: QueryPricesResponse, ) -> Result { - use astria_core::connect::types::v2::CurrencyPairId; + use astria_core::oracles::price_feed::types::v2::CurrencyPairId; let strategy_prices = rsp.prices.into_iter().map(|(currency_pair, price)| async move { DefaultCurrencyPairStrategy::id(state, ¤cy_pair).await @@ -328,7 +328,7 @@ async fn get_id_to_currency_pair( state: &S, all_ids: HashSet, ) -> Result> { - use crate::connect::market_map::state_ext::StateReadExt as _; + use crate::oracles::price_feed::market_map::state_ext::StateReadExt as _; let market_map = state .get_market_map() .await @@ -585,7 +585,7 @@ pub(super) async fn apply_prices_from_vote_extensions( id_to_currency_pair, } = extended_commit_info; - let prices = astria_core::connect::utils::calculate_prices_from_vote_extensions( + let prices = astria_core::oracles::price_feed::utils::calculate_prices_from_vote_extensions( extended_commit_info, id_to_currency_pair, ) @@ -622,7 +622,8 @@ mod test { }; use astria_core::{ - connect::{ + crypto::SigningKey, + oracles::price_feed::{ market_map::v2::{ Market, MarketMap, @@ -635,7 +636,6 @@ mod test { CurrencyPairNonce, }, }, - crypto::SigningKey, protocol::transaction::v1::action::ValidatorUpdate, Timestamp, }; @@ -659,7 +659,7 @@ mod test { StateWriteExt as _, ValidatorSet, }, - connect::market_map::state_ext::StateWriteExt as _, + oracles::price_feed::market_map::state_ext::StateWriteExt as _, }; const CHAIN_ID: &str = "test-0"; diff --git a/crates/astria-sequencer/src/config.rs b/crates/astria-sequencer/src/config.rs index 6eeb3afa20..096f565d49 100644 --- a/crates/astria-sequencer/src/config.rs +++ b/crates/astria-sequencer/src/config.rs @@ -35,13 +35,13 @@ pub struct Config { /// The address of the CometBFT RPC endpoint for this sequencer. #[expect(clippy::doc_markdown, reason = "false positive")] pub cometbft_rpc_addr: String, - /// If the oracle is disabled. If false, the `oracle_grpc_addr` must be set. + /// If the price feed is disabled. If false, the `price_feed_grpc_addr` must be set. /// Should be false for validator nodes and true for non-validator nodes. - pub no_oracle: bool, - /// The gRPC endpoint for the oracle sidecar. - pub oracle_grpc_addr: String, - /// The timeout for the responses from the oracle sidecar in milliseconds. - pub oracle_client_timeout_milliseconds: u64, + pub no_price_feed: bool, + /// The gRPC endpoint for the price feed oracle sidecar. + pub price_feed_grpc_addr: String, + /// The timeout for the responses from the price feed oracle sidecar in milliseconds. + pub price_feed_client_timeout_milliseconds: u64, /// The maximum number of transactions that can be parked in the mempool. pub mempool_parked_max_tx_count: usize, } diff --git a/crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__last_updated_key.snap b/crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__last_updated_key.snap deleted file mode 100644 index b8a6dc7a96..0000000000 --- a/crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__last_updated_key.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: crates/astria-sequencer/src/connect/market_map/storage/keys.rs -expression: LAST_UPDATED ---- -connect/market_map/last_updated diff --git a/crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__market_map_key.snap b/crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__market_map_key.snap deleted file mode 100644 index c02e9145cf..0000000000 --- a/crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__market_map_key.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: crates/astria-sequencer/src/connect/market_map/storage/keys.rs -expression: MARKET_MAP ---- -connect/market_map/market_map diff --git a/crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__params_key.snap b/crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__params_key.snap deleted file mode 100644 index 069a4c18ce..0000000000 --- a/crates/astria-sequencer/src/connect/market_map/storage/snapshots/astria_sequencer__connect__market_map__storage__keys__tests__params_key.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: crates/astria-sequencer/src/connect/market_map/storage/keys.rs -expression: PARAMS ---- -connect/market_map/params diff --git a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__currency_pair_state_key.snap b/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__currency_pair_state_key.snap deleted file mode 100644 index 5ee746e03d..0000000000 --- a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__currency_pair_state_key.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: crates/astria-sequencer/src/connect/oracle/storage/keys.rs -expression: currency_pair_state(¤cy_pair()) ---- -connect/oracle/currency_pair_state/abc/def diff --git a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__currency_pair_to_id_key.snap b/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__currency_pair_to_id_key.snap deleted file mode 100644 index ba55441829..0000000000 --- a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__currency_pair_to_id_key.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: crates/astria-sequencer/src/connect/oracle/storage/keys.rs -expression: currency_pair_to_id(¤cy_pair()) ---- -connect/oracle/currency_pair_to_id/abc/def diff --git a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__id_to_currency_pair_key.snap b/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__id_to_currency_pair_key.snap deleted file mode 100644 index e92f14d0a0..0000000000 --- a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__id_to_currency_pair_key.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: crates/astria-sequencer/src/connect/oracle/storage/keys.rs -expression: "id_to_currency_pair(CurrencyPairId::new(9))" ---- -connect/oracle/id_to_currency_pair/9 diff --git a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__next_currency_pair_id_key.snap b/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__next_currency_pair_id_key.snap deleted file mode 100644 index 14ae395327..0000000000 --- a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__next_currency_pair_id_key.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: crates/astria-sequencer/src/connect/oracle/storage/keys.rs -expression: NEXT_CURRENCY_PAIR_ID ---- -connect/oracle/next_currency_pair_id diff --git a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__num_currency_pairs_key.snap b/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__num_currency_pairs_key.snap deleted file mode 100644 index 6b8a199765..0000000000 --- a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__num_currency_pairs_key.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: crates/astria-sequencer/src/connect/oracle/storage/keys.rs -expression: NUM_CURRENCY_PAIRS ---- -connect/oracle/num_currency_pairs diff --git a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__num_removed_currency_pairs_key.snap b/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__num_removed_currency_pairs_key.snap deleted file mode 100644 index 02fdd34d9a..0000000000 --- a/crates/astria-sequencer/src/connect/oracle/storage/snapshots/astria_sequencer__connect__oracle__storage__keys__tests__num_removed_currency_pairs_key.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: crates/astria-sequencer/src/connect/oracle/storage/keys.rs -expression: NUM_REMOVED_CURRENCY_PAIRS ---- -connect/oracle/num_removed_currency_pairs diff --git a/crates/astria-sequencer/src/grpc/mod.rs b/crates/astria-sequencer/src/grpc/mod.rs index 023e7386b5..42d4255607 100644 --- a/crates/astria-sequencer/src/grpc/mod.rs +++ b/crates/astria-sequencer/src/grpc/mod.rs @@ -1,4 +1,4 @@ -pub(crate) mod connect; +pub(crate) mod price_feed; pub(crate) mod sequencer; mod state_ext; pub(crate) mod storage; diff --git a/crates/astria-sequencer/src/grpc/connect.rs b/crates/astria-sequencer/src/grpc/price_feed.rs similarity index 94% rename from crates/astria-sequencer/src/grpc/connect.rs rename to crates/astria-sequencer/src/grpc/price_feed.rs index ea4efa7a8e..1bb7e89581 100644 --- a/crates/astria-sequencer/src/grpc/connect.rs +++ b/crates/astria-sequencer/src/grpc/price_feed.rs @@ -4,8 +4,7 @@ use std::{ }; use astria_core::{ - connect::types::v2::CurrencyPair, - generated::connect::{ + generated::price_feed::{ marketmap::v2::{ query_server::Query as MarketMapQueryService, LastUpdatedRequest, @@ -29,6 +28,7 @@ use astria_core::{ GetPricesResponse, }, }, + oracles::price_feed::types::v2::CurrencyPair, }; use cnidarium::Storage; use futures::{ @@ -44,7 +44,7 @@ use tracing::instrument; use crate::{ app::StateReadExt as _, - connect::{ + oracles::price_feed::{ market_map::state_ext::StateReadExt as _, oracle::state_ext::{ CurrencyPairWithId, @@ -92,7 +92,8 @@ impl MarketMapQueryService for SequencerServer { .map_err(|e| Status::internal(format!("failed to get chain id from storage: {e:#}")))?; Ok(Response::new(MarketMapResponse { - market_map: market_map.map(astria_core::connect::market_map::v2::MarketMap::into_raw), + market_map: market_map + .map(astria_core::oracles::price_feed::market_map::v2::MarketMap::into_raw), last_updated, chain_id: chain_id.to_string(), })) @@ -137,7 +138,7 @@ impl MarketMapQueryService for SequencerServer { })?; Ok(Response::new(ParamsResponse { - params: params.map(astria_core::connect::market_map::v2::Params::into_raw), + params: params.map(astria_core::oracles::price_feed::market_map::v2::Params::into_raw), })) } } @@ -208,7 +209,7 @@ impl OracleService for SequencerServer { Ok(Response::new(GetPriceResponse { price: state .price - .map(astria_core::connect::oracle::v2::QuotePrice::into_raw), + .map(astria_core::oracles::price_feed::oracle::v2::QuotePrice::into_raw), nonce: state.nonce.get(), id: state.id.get(), decimals: market.ticker.decimals, @@ -264,7 +265,7 @@ impl OracleService for SequencerServer { prices.push(GetPriceResponse { price: state .price - .map(astria_core::connect::oracle::v2::QuotePrice::into_raw), + .map(astria_core::oracles::price_feed::oracle::v2::QuotePrice::into_raw), nonce: state.nonce.get(), id: state.id.get(), decimals: market.ticker.decimals, diff --git a/crates/astria-sequencer/src/lib.rs b/crates/astria-sequencer/src/lib.rs index 42104cf26c..62178c8fb2 100644 --- a/crates/astria-sequencer/src/lib.rs +++ b/crates/astria-sequencer/src/lib.rs @@ -12,12 +12,12 @@ pub(crate) mod bridge; mod build_info; pub(crate) mod component; pub mod config; -pub(crate) mod connect; pub(crate) mod fees; pub(crate) mod grpc; pub(crate) mod ibc; mod mempool; pub(crate) mod metrics; +pub(crate) mod oracles; pub(crate) mod proposal; mod sequencer; pub(crate) mod service; diff --git a/crates/astria-sequencer/src/oracles/mod.rs b/crates/astria-sequencer/src/oracles/mod.rs new file mode 100644 index 0000000000..77cec4cbfe --- /dev/null +++ b/crates/astria-sequencer/src/oracles/mod.rs @@ -0,0 +1 @@ +pub(crate) mod price_feed; diff --git a/crates/astria-sequencer/src/connect/market_map/component.rs b/crates/astria-sequencer/src/oracles/price_feed/market_map/component.rs similarity index 90% rename from crates/astria-sequencer/src/connect/market_map/component.rs rename to crates/astria-sequencer/src/oracles/price_feed/market_map/component.rs index 2962f91e7a..afb70a4740 100644 --- a/crates/astria-sequencer/src/connect/market_map/component.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/component.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use astria_core::{ - connect::market_map::v2::GenesisState, + oracles::price_feed::market_map::v2::GenesisState, protocol::genesis::v1::GenesisAppState, }; use astria_eyre::eyre::{ @@ -43,8 +43,8 @@ impl Component for MarketMapComponent { #[instrument(name = "MarketMapComponent::init_chain", skip_all, err)] async fn init_chain(state: S, app_state: &Self::AppState) -> Result<()> { - if let Some(connect) = app_state.connect() { - Self::handle_genesis(state, connect.market_map())?; + if let Some(price_feed) = app_state.price_feed() { + Self::handle_genesis(state, price_feed.market_map())?; } Ok(()) diff --git a/crates/astria-sequencer/src/connect/market_map/mod.rs b/crates/astria-sequencer/src/oracles/price_feed/market_map/mod.rs similarity index 100% rename from crates/astria-sequencer/src/connect/market_map/mod.rs rename to crates/astria-sequencer/src/oracles/price_feed/market_map/mod.rs diff --git a/crates/astria-sequencer/src/connect/market_map/state_ext.rs b/crates/astria-sequencer/src/oracles/price_feed/market_map/state_ext.rs similarity index 99% rename from crates/astria-sequencer/src/connect/market_map/state_ext.rs rename to crates/astria-sequencer/src/oracles/price_feed/market_map/state_ext.rs index 2f6e438a0f..314c6340e0 100644 --- a/crates/astria-sequencer/src/connect/market_map/state_ext.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/state_ext.rs @@ -1,4 +1,4 @@ -use astria_core::connect::market_map::v2::{ +use astria_core::oracles::price_feed::market_map::v2::{ MarketMap, Params, }; @@ -111,7 +111,7 @@ impl StateWriteExt for T {} #[cfg(test)] mod tests { - use astria_core::generated::connect::{ + use astria_core::generated::price_feed::{ marketmap::v2 as raw, types::v2::CurrencyPair, }; diff --git a/crates/astria-sequencer/src/connect/market_map/storage/keys.rs b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/keys.rs similarity index 57% rename from crates/astria-sequencer/src/connect/market_map/storage/keys.rs rename to crates/astria-sequencer/src/oracles/price_feed/market_map/storage/keys.rs index c134796b5b..1c36f403ec 100644 --- a/crates/astria-sequencer/src/connect/market_map/storage/keys.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/keys.rs @@ -1,12 +1,14 @@ -pub(in crate::connect::market_map) const MARKET_MAP: &str = "connect/market_map/market_map"; -pub(in crate::connect::market_map) const PARAMS: &str = "connect/market_map/params"; -pub(in crate::connect::market_map) const LAST_UPDATED: &str = "connect/market_map/last_updated"; +pub(in crate::oracles::price_feed::market_map) const MARKET_MAP: &str = + "price_feed/market_map/market_map"; +pub(in crate::oracles::price_feed::market_map) const PARAMS: &str = "price_feed/market_map/params"; +pub(in crate::oracles::price_feed::market_map) const LAST_UPDATED: &str = + "price_feed/market_map/last_updated"; #[cfg(test)] mod tests { use super::*; - const COMPONENT_PREFIX: &str = "connect/market_map/"; + const COMPONENT_PREFIX: &str = "price_feed/market_map/"; #[test] fn keys_should_not_change() { diff --git a/crates/astria-sequencer/src/connect/market_map/storage/mod.rs b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/mod.rs similarity index 100% rename from crates/astria-sequencer/src/connect/market_map/storage/mod.rs rename to crates/astria-sequencer/src/oracles/price_feed/market_map/storage/mod.rs diff --git a/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__last_updated_key.snap b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__last_updated_key.snap new file mode 100644 index 0000000000..ec47385c87 --- /dev/null +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__last_updated_key.snap @@ -0,0 +1,5 @@ +--- +source: crates/astria-sequencer/src/oracles/price_feed/market_map/storage/keys.rs +expression: LAST_UPDATED +--- +price_feed/market_map/last_updated diff --git a/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__market_map_key.snap b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__market_map_key.snap new file mode 100644 index 0000000000..8db1510e63 --- /dev/null +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__market_map_key.snap @@ -0,0 +1,5 @@ +--- +source: crates/astria-sequencer/src/oracles/price_feed/market_map/storage/keys.rs +expression: MARKET_MAP +--- +price_feed/market_map/market_map diff --git a/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__params_key.snap b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__params_key.snap new file mode 100644 index 0000000000..52740321b1 --- /dev/null +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/snapshots/astria_sequencer__oracles__price_feed__market_map__storage__keys__tests__params_key.snap @@ -0,0 +1,5 @@ +--- +source: crates/astria-sequencer/src/oracles/price_feed/market_map/storage/keys.rs +expression: PARAMS +--- +price_feed/market_map/params diff --git a/crates/astria-sequencer/src/connect/market_map/storage/values/block_height.rs b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/block_height.rs similarity index 71% rename from crates/astria-sequencer/src/connect/market_map/storage/values/block_height.rs rename to crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/block_height.rs index 065eff7fa7..4237745bf0 100644 --- a/crates/astria-sequencer/src/connect/market_map/storage/values/block_height.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/block_height.rs @@ -10,7 +10,7 @@ use super::{ }; #[derive(Debug, BorshSerialize, BorshDeserialize)] -pub(in crate::connect::market_map) struct BlockHeight(u64); +pub(in crate::oracles::price_feed::market_map) struct BlockHeight(u64); impl From for BlockHeight { fn from(block_height: u64) -> Self { @@ -26,7 +26,7 @@ impl From for u64 { impl<'a> From for crate::storage::StoredValue<'a> { fn from(block_height: BlockHeight) -> Self { - crate::storage::StoredValue::ConnectMarketMap(Value(ValueImpl::BlockHeight(block_height))) + crate::storage::StoredValue::PriceFeedMarketMap(Value(ValueImpl::BlockHeight(block_height))) } } @@ -34,12 +34,12 @@ impl<'a> TryFrom> for BlockHeight { type Error = astria_eyre::eyre::Error; fn try_from(value: crate::storage::StoredValue<'a>) -> Result { - let crate::storage::StoredValue::ConnectMarketMap(Value(ValueImpl::BlockHeight( + let crate::storage::StoredValue::PriceFeedMarketMap(Value(ValueImpl::BlockHeight( block_height, ))) = value else { bail!( - "connect market map stored value type mismatch: expected block height, found \ + "price feed market map stored value type mismatch: expected block height, found \ {value:?}" ); }; diff --git a/crates/astria-sequencer/src/connect/market_map/storage/values/market_map.rs b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/market_map.rs similarity index 92% rename from crates/astria-sequencer/src/connect/market_map/storage/values/market_map.rs rename to crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/market_map.rs index 5c6c7c5377..c6541e13a0 100644 --- a/crates/astria-sequencer/src/connect/market_map/storage/values/market_map.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/market_map.rs @@ -1,6 +1,6 @@ use std::borrow::Cow; -use astria_core::connect::{ +use astria_core::oracles::price_feed::{ market_map::v2::{ Market as DomainMarket, MarketMap as DomainMarketMap, @@ -155,7 +155,7 @@ impl<'a> From> for (String, DomainMarket) { } #[derive(Debug, BorshSerialize, BorshDeserialize)] -pub(in crate::connect::market_map) struct MarketMap<'a>(Vec>); +pub(in crate::oracles::price_feed::market_map) struct MarketMap<'a>(Vec>); impl<'a> From<&'a DomainMarketMap> for MarketMap<'a> { fn from(market_map: &'a DomainMarketMap) -> Self { @@ -173,7 +173,7 @@ impl<'a> From> for DomainMarketMap { impl<'a> From> for crate::storage::StoredValue<'a> { fn from(market_map: MarketMap<'a>) -> Self { - crate::storage::StoredValue::ConnectMarketMap(Value(ValueImpl::MarketMap(market_map))) + crate::storage::StoredValue::PriceFeedMarketMap(Value(ValueImpl::MarketMap(market_map))) } } @@ -181,11 +181,12 @@ impl<'a> TryFrom> for MarketMap<'a> { type Error = astria_eyre::eyre::Error; fn try_from(value: crate::storage::StoredValue<'a>) -> Result { - let crate::storage::StoredValue::ConnectMarketMap(Value(ValueImpl::MarketMap(market_map))) = - value + let crate::storage::StoredValue::PriceFeedMarketMap(Value(ValueImpl::MarketMap( + market_map, + ))) = value else { bail!( - "connect market map stored value type mismatch: expected market map, found \ + "price feed market map stored value type mismatch: expected market map, found \ {value:?}" ); }; diff --git a/crates/astria-sequencer/src/connect/market_map/storage/values/mod.rs b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/mod.rs similarity index 88% rename from crates/astria-sequencer/src/connect/market_map/storage/values/mod.rs rename to crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/mod.rs index b9e1c25878..900d33b5cb 100644 --- a/crates/astria-sequencer/src/connect/market_map/storage/values/mod.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/mod.rs @@ -3,7 +3,7 @@ use borsh::{ BorshSerialize, }; -pub(in crate::connect::market_map) use self::{ +pub(in crate::oracles::price_feed::market_map) use self::{ block_height::BlockHeight, market_map::MarketMap, params::Params, diff --git a/crates/astria-sequencer/src/connect/market_map/storage/values/params.rs b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/params.rs similarity index 85% rename from crates/astria-sequencer/src/connect/market_map/storage/values/params.rs rename to crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/params.rs index 6b8c9ee621..911c8492da 100644 --- a/crates/astria-sequencer/src/connect/market_map/storage/values/params.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/market_map/storage/values/params.rs @@ -8,7 +8,7 @@ use std::{ }; use astria_core::{ - connect::market_map::v2::Params as DomainParams, + oracles::price_feed::market_map::v2::Params as DomainParams, primitive::v1::{ Address, ADDRESS_LEN, @@ -28,7 +28,7 @@ use super::{ }; #[derive(BorshSerialize, BorshDeserialize)] -pub(in crate::connect::market_map) struct Params<'a> { +pub(in crate::oracles::price_feed::market_map) struct Params<'a> { market_authorities: Vec>, admin: Cow<'a, [u8; ADDRESS_LEN]>, // NOTE: All addresses in the `market_authorities` and `admin` have the same prefix. @@ -86,7 +86,7 @@ impl<'a> From> for DomainParams { impl<'a> From> for crate::storage::StoredValue<'a> { fn from(params: Params<'a>) -> Self { - crate::storage::StoredValue::ConnectMarketMap(Value(ValueImpl::Params(params))) + crate::storage::StoredValue::PriceFeedMarketMap(Value(ValueImpl::Params(params))) } } @@ -94,10 +94,12 @@ impl<'a> TryFrom> for Params<'a> { type Error = astria_eyre::eyre::Error; fn try_from(value: crate::storage::StoredValue<'a>) -> Result { - let crate::storage::StoredValue::ConnectMarketMap(Value(ValueImpl::Params(params))) = value + let crate::storage::StoredValue::PriceFeedMarketMap(Value(ValueImpl::Params(params))) = + value else { bail!( - "connect market map stored value type mismatch: expected params, found {value:?}" + "price feed market map stored value type mismatch: expected params, found \ + {value:?}" ); }; Ok(params) diff --git a/crates/astria-sequencer/src/connect/mod.rs b/crates/astria-sequencer/src/oracles/price_feed/mod.rs similarity index 100% rename from crates/astria-sequencer/src/connect/mod.rs rename to crates/astria-sequencer/src/oracles/price_feed/mod.rs diff --git a/crates/astria-sequencer/src/connect/oracle/component.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/component.rs similarity index 93% rename from crates/astria-sequencer/src/connect/oracle/component.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/component.rs index c6759454d0..59d0a1e504 100644 --- a/crates/astria-sequencer/src/connect/oracle/component.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/component.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use astria_core::{ - connect::oracle::v2::{ + oracles::price_feed::oracle::v2::{ CurrencyPairState, GenesisState, }, @@ -54,8 +54,8 @@ impl Component for OracleComponent { #[instrument(name = "OracleComponent::init_chain", skip_all, err)] async fn init_chain(state: S, app_state: &Self::AppState) -> Result<()> { - if let Some(connect) = app_state.connect() { - Self::handle_genesis(state, connect.oracle())?; + if let Some(price_feed) = app_state.price_feed() { + Self::handle_genesis(state, price_feed.oracle())?; } Ok(()) } diff --git a/crates/astria-sequencer/src/connect/oracle/currency_pair_strategy.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/currency_pair_strategy.rs similarity index 91% rename from crates/astria-sequencer/src/connect/oracle/currency_pair_strategy.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/currency_pair_strategy.rs index 27bc777ce3..5a18bd0a31 100644 --- a/crates/astria-sequencer/src/connect/oracle/currency_pair_strategy.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/currency_pair_strategy.rs @@ -1,4 +1,4 @@ -use astria_core::connect::types::v2::{ +use astria_core::oracles::price_feed::types::v2::{ CurrencyPair, CurrencyPairId, }; @@ -7,7 +7,7 @@ use astria_eyre::eyre::{ WrapErr as _, }; -use crate::connect::oracle::state_ext::StateReadExt; +use crate::oracles::price_feed::oracle::state_ext::StateReadExt; /// see pub(crate) struct DefaultCurrencyPairStrategy; diff --git a/crates/astria-sequencer/src/connect/oracle/mod.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/mod.rs similarity index 100% rename from crates/astria-sequencer/src/connect/oracle/mod.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/mod.rs diff --git a/crates/astria-sequencer/src/connect/oracle/state_ext.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/state_ext.rs similarity index 99% rename from crates/astria-sequencer/src/connect/oracle/state_ext.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/state_ext.rs index 1d2428130a..136e1cc917 100644 --- a/crates/astria-sequencer/src/connect/oracle/state_ext.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/state_ext.rs @@ -7,7 +7,7 @@ use std::{ }, }; -use astria_core::connect::{ +use astria_core::oracles::price_feed::{ oracle::v2::{ CurrencyPairState, QuotePrice, @@ -354,7 +354,7 @@ fn put_currency_pair( #[cfg(test)] mod tests { use astria_core::{ - connect::types::v2::{ + oracles::price_feed::types::v2::{ CurrencyPair, Price, }, diff --git a/crates/astria-sequencer/src/connect/oracle/storage/keys.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/keys.rs similarity index 71% rename from crates/astria-sequencer/src/connect/oracle/storage/keys.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/storage/keys.rs index bb81fdf22c..93ff1d8077 100644 --- a/crates/astria-sequencer/src/connect/oracle/storage/keys.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/keys.rs @@ -1,4 +1,4 @@ -use astria_core::connect::types::v2::{ +use astria_core::oracles::price_feed::types::v2::{ Base, CurrencyPair, CurrencyPairId, @@ -9,17 +9,20 @@ use astria_eyre::eyre::{ Result, }; -pub(in crate::connect::oracle) const CURRENCY_PAIR_TO_ID_PREFIX: &str = - "connect/oracle/currency_pair_to_id/"; -const ID_TO_CURRENCY_PAIR_PREFIX: &str = "connect/oracle/id_to_currency_pair/"; -pub(in crate::connect::oracle) const CURRENCY_PAIR_STATE_PREFIX: &str = - "connect/oracle/currency_pair_state/"; +pub(in crate::oracles::price_feed::oracle) const CURRENCY_PAIR_TO_ID_PREFIX: &str = + "price_feed/oracle/currency_pair_to_id/"; +const ID_TO_CURRENCY_PAIR_PREFIX: &str = "price_feed/oracle/id_to_currency_pair/"; +pub(in crate::oracles::price_feed::oracle) const CURRENCY_PAIR_STATE_PREFIX: &str = + "price_feed/oracle/currency_pair_state/"; -pub(in crate::connect::oracle) const NUM_CURRENCY_PAIRS: &str = "connect/oracle/num_currency_pairs"; -pub(in crate::connect::oracle) const NEXT_CURRENCY_PAIR_ID: &str = - "connect/oracle/next_currency_pair_id"; +pub(in crate::oracles::price_feed::oracle) const NUM_CURRENCY_PAIRS: &str = + "price_feed/oracle/num_currency_pairs"; +pub(in crate::oracles::price_feed::oracle) const NEXT_CURRENCY_PAIR_ID: &str = + "price_feed/oracle/next_currency_pair_id"; -pub(in crate::connect::oracle) fn currency_pair_to_id(currency_pair: &CurrencyPair) -> String { +pub(in crate::oracles::price_feed::oracle) fn currency_pair_to_id( + currency_pair: &CurrencyPair, +) -> String { format!( "{CURRENCY_PAIR_TO_ID_PREFIX}{}/{}", currency_pair.base(), @@ -27,21 +30,23 @@ pub(in crate::connect::oracle) fn currency_pair_to_id(currency_pair: &CurrencyPa ) } -pub(in crate::connect::oracle) fn id_to_currency_pair(id: CurrencyPairId) -> String { +pub(in crate::oracles::price_feed::oracle) fn id_to_currency_pair(id: CurrencyPairId) -> String { format!("{ID_TO_CURRENCY_PAIR_PREFIX}{id}") } -pub(in crate::connect::oracle) fn currency_pair_state(currency_pair: &CurrencyPair) -> String { +pub(in crate::oracles::price_feed::oracle) fn currency_pair_state( + currency_pair: &CurrencyPair, +) -> String { format!("{CURRENCY_PAIR_STATE_PREFIX}{currency_pair}") } -pub(in crate::connect::oracle) fn extract_currency_pair_from_pair_to_id_key( +pub(in crate::oracles::price_feed::oracle) fn extract_currency_pair_from_pair_to_id_key( key: &str, ) -> Result { extract_currency_pair_from_key(CURRENCY_PAIR_TO_ID_PREFIX, key) } -pub(in crate::connect::oracle) fn extract_currency_pair_from_pair_state_key( +pub(in crate::oracles::price_feed::oracle) fn extract_currency_pair_from_pair_state_key( key: &str, ) -> Result { extract_currency_pair_from_key(CURRENCY_PAIR_STATE_PREFIX, key) @@ -62,14 +67,14 @@ fn extract_currency_pair_from_key(prefix: &str, key: &str) -> Result CurrencyPair { CurrencyPair::from_parts( diff --git a/crates/astria-sequencer/src/connect/oracle/storage/mod.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/mod.rs similarity index 100% rename from crates/astria-sequencer/src/connect/oracle/storage/mod.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/storage/mod.rs diff --git a/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__currency_pair_state_key.snap b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__currency_pair_state_key.snap new file mode 100644 index 0000000000..0f375c2f23 --- /dev/null +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__currency_pair_state_key.snap @@ -0,0 +1,5 @@ +--- +source: crates/astria-sequencer/src/oracles/price_feed/oracle/storage/keys.rs +expression: currency_pair_state(¤cy_pair()) +--- +price_feed/oracle/currency_pair_state/abc/def diff --git a/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__currency_pair_to_id_key.snap b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__currency_pair_to_id_key.snap new file mode 100644 index 0000000000..1f82a2bca2 --- /dev/null +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__currency_pair_to_id_key.snap @@ -0,0 +1,5 @@ +--- +source: crates/astria-sequencer/src/oracles/price_feed/oracle/storage/keys.rs +expression: currency_pair_to_id(¤cy_pair()) +--- +price_feed/oracle/currency_pair_to_id/abc/def diff --git a/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__id_to_currency_pair_key.snap b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__id_to_currency_pair_key.snap new file mode 100644 index 0000000000..671e122aa5 --- /dev/null +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__id_to_currency_pair_key.snap @@ -0,0 +1,5 @@ +--- +source: crates/astria-sequencer/src/oracles/price_feed/oracle/storage/keys.rs +expression: "id_to_currency_pair(CurrencyPairId::new(9))" +--- +price_feed/oracle/id_to_currency_pair/9 diff --git a/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__next_currency_pair_id_key.snap b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__next_currency_pair_id_key.snap new file mode 100644 index 0000000000..d010c6cddb --- /dev/null +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__next_currency_pair_id_key.snap @@ -0,0 +1,5 @@ +--- +source: crates/astria-sequencer/src/oracles/price_feed/oracle/storage/keys.rs +expression: NEXT_CURRENCY_PAIR_ID +--- +price_feed/oracle/next_currency_pair_id diff --git a/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__num_currency_pairs_key.snap b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__num_currency_pairs_key.snap new file mode 100644 index 0000000000..856fc711db --- /dev/null +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/snapshots/astria_sequencer__oracles__price_feed__oracle__storage__keys__tests__num_currency_pairs_key.snap @@ -0,0 +1,5 @@ +--- +source: crates/astria-sequencer/src/oracles/price_feed/oracle/storage/keys.rs +expression: NUM_CURRENCY_PAIRS +--- +price_feed/oracle/num_currency_pairs diff --git a/crates/astria-sequencer/src/connect/oracle/storage/values/count.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/count.rs similarity index 67% rename from crates/astria-sequencer/src/connect/oracle/storage/values/count.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/count.rs index 9b0353665f..1a6c0c5fa3 100644 --- a/crates/astria-sequencer/src/connect/oracle/storage/values/count.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/count.rs @@ -10,7 +10,7 @@ use super::{ }; #[derive(Debug, BorshSerialize, BorshDeserialize)] -pub(in crate::connect::oracle) struct Count(u64); +pub(in crate::oracles::price_feed::oracle) struct Count(u64); impl From for Count { fn from(count: u64) -> Self { @@ -26,7 +26,7 @@ impl From for u64 { impl<'a> From for crate::storage::StoredValue<'a> { fn from(count: Count) -> Self { - crate::storage::StoredValue::ConnectOracle(Value(ValueImpl::Count(count))) + crate::storage::StoredValue::PriceFeedOracle(Value(ValueImpl::Count(count))) } } @@ -34,9 +34,9 @@ impl<'a> TryFrom> for Count { type Error = astria_eyre::eyre::Error; fn try_from(value: crate::storage::StoredValue<'a>) -> Result { - let crate::storage::StoredValue::ConnectOracle(Value(ValueImpl::Count(count))) = value + let crate::storage::StoredValue::PriceFeedOracle(Value(ValueImpl::Count(count))) = value else { - bail!("connect oracle stored value type mismatch: expected count, found {value:?}"); + bail!("price feed oracle stored value type mismatch: expected count, found {value:?}"); }; Ok(count) } diff --git a/crates/astria-sequencer/src/connect/oracle/storage/values/currency_pair.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/currency_pair.rs similarity index 77% rename from crates/astria-sequencer/src/connect/oracle/storage/values/currency_pair.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/currency_pair.rs index d46114e05b..c29198a0f0 100644 --- a/crates/astria-sequencer/src/connect/oracle/storage/values/currency_pair.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/currency_pair.rs @@ -1,6 +1,6 @@ use std::borrow::Cow; -use astria_core::connect::types::v2::{ +use astria_core::oracles::price_feed::types::v2::{ Base, CurrencyPair as DomainCurrencyPair, Quote, @@ -17,7 +17,7 @@ use super::{ }; #[derive(Debug, BorshSerialize, BorshDeserialize)] -pub(in crate::connect::oracle) struct CurrencyPair<'a> { +pub(in crate::oracles::price_feed::oracle) struct CurrencyPair<'a> { base: Cow<'a, str>, quote: Cow<'a, str>, } @@ -42,7 +42,7 @@ impl<'a> From> for DomainCurrencyPair { impl<'a> From> for crate::storage::StoredValue<'a> { fn from(currency_pair: CurrencyPair<'a>) -> Self { - crate::storage::StoredValue::ConnectOracle(Value(ValueImpl::CurrencyPair(currency_pair))) + crate::storage::StoredValue::PriceFeedOracle(Value(ValueImpl::CurrencyPair(currency_pair))) } } @@ -50,12 +50,12 @@ impl<'a> TryFrom> for CurrencyPair<'a> { type Error = astria_eyre::eyre::Error; fn try_from(value: crate::storage::StoredValue<'a>) -> Result { - let crate::storage::StoredValue::ConnectOracle(Value(ValueImpl::CurrencyPair( + let crate::storage::StoredValue::PriceFeedOracle(Value(ValueImpl::CurrencyPair( currency_pair, ))) = value else { bail!( - "connect oracle stored value type mismatch: expected currency pair, found \ + "price feed oracle stored value type mismatch: expected currency pair, found \ {value:?}" ); }; diff --git a/crates/astria-sequencer/src/connect/oracle/storage/values/currency_pair_id.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/currency_pair_id.rs similarity index 67% rename from crates/astria-sequencer/src/connect/oracle/storage/values/currency_pair_id.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/currency_pair_id.rs index 22f1491ce8..bb2aa99035 100644 --- a/crates/astria-sequencer/src/connect/oracle/storage/values/currency_pair_id.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/currency_pair_id.rs @@ -1,4 +1,4 @@ -use astria_core::connect::types::v2::CurrencyPairId as DomainCurrencyPairId; +use astria_core::oracles::price_feed::types::v2::CurrencyPairId as DomainCurrencyPairId; use astria_eyre::eyre::bail; use borsh::{ BorshDeserialize, @@ -11,7 +11,7 @@ use super::{ }; #[derive(Debug, BorshSerialize, BorshDeserialize)] -pub(in crate::connect::oracle) struct CurrencyPairId(u64); +pub(in crate::oracles::price_feed::oracle) struct CurrencyPairId(u64); impl From for CurrencyPairId { fn from(id: DomainCurrencyPairId) -> Self { @@ -27,7 +27,7 @@ impl From for DomainCurrencyPairId { impl<'a> From for crate::storage::StoredValue<'a> { fn from(id: CurrencyPairId) -> Self { - crate::storage::StoredValue::ConnectOracle(Value(ValueImpl::CurrencyPairId(id))) + crate::storage::StoredValue::PriceFeedOracle(Value(ValueImpl::CurrencyPairId(id))) } } @@ -35,11 +35,11 @@ impl<'a> TryFrom> for CurrencyPairId { type Error = astria_eyre::eyre::Error; fn try_from(value: crate::storage::StoredValue<'a>) -> Result { - let crate::storage::StoredValue::ConnectOracle(Value(ValueImpl::CurrencyPairId(id))) = + let crate::storage::StoredValue::PriceFeedOracle(Value(ValueImpl::CurrencyPairId(id))) = value else { bail!( - "connect oracle stored value type mismatch: expected currency pair id, found \ + "price feed oracle stored value type mismatch: expected currency pair id, found \ {value:?}" ); }; diff --git a/crates/astria-sequencer/src/connect/oracle/storage/values/currency_pair_state.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/currency_pair_state.rs similarity index 86% rename from crates/astria-sequencer/src/connect/oracle/storage/values/currency_pair_state.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/currency_pair_state.rs index 6dc19ad75f..ea1965c844 100644 --- a/crates/astria-sequencer/src/connect/oracle/storage/values/currency_pair_state.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/currency_pair_state.rs @@ -1,5 +1,5 @@ use astria_core::{ - connect::{ + oracles::price_feed::{ oracle::v2::{ CurrencyPairState as DomainCurrencyPairState, QuotePrice as DomainQuotePrice, @@ -76,7 +76,7 @@ impl From for DomainQuotePrice { } #[derive(Debug, BorshSerialize, BorshDeserialize)] -pub(in crate::connect::oracle) struct CurrencyPairState { +pub(in crate::oracles::price_feed::oracle) struct CurrencyPairState { price: Option, nonce: u64, id: CurrencyPairId, @@ -104,7 +104,7 @@ impl From for DomainCurrencyPairState { impl<'a> From for crate::storage::StoredValue<'a> { fn from(state: CurrencyPairState) -> Self { - crate::storage::StoredValue::ConnectOracle(Value(ValueImpl::CurrencyPairState(state))) + crate::storage::StoredValue::PriceFeedOracle(Value(ValueImpl::CurrencyPairState(state))) } } @@ -112,12 +112,13 @@ impl<'a> TryFrom> for CurrencyPairState { type Error = astria_eyre::eyre::Error; fn try_from(value: crate::storage::StoredValue<'a>) -> Result { - let crate::storage::StoredValue::ConnectOracle(Value(ValueImpl::CurrencyPairState(state))) = - value + let crate::storage::StoredValue::PriceFeedOracle(Value(ValueImpl::CurrencyPairState( + state, + ))) = value else { bail!( - "connect oracle stored value type mismatch: expected currency pair state, found \ - {value:?}" + "price feed oracle stored value type mismatch: expected currency pair state, \ + found {value:?}" ); }; Ok(state) diff --git a/crates/astria-sequencer/src/connect/oracle/storage/values/mod.rs b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/mod.rs similarity index 91% rename from crates/astria-sequencer/src/connect/oracle/storage/values/mod.rs rename to crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/mod.rs index f3fb1783fb..35141ebf9b 100644 --- a/crates/astria-sequencer/src/connect/oracle/storage/values/mod.rs +++ b/crates/astria-sequencer/src/oracles/price_feed/oracle/storage/values/mod.rs @@ -3,7 +3,7 @@ use borsh::{ BorshSerialize, }; -pub(in crate::connect::oracle) use self::{ +pub(in crate::oracles::price_feed::oracle) use self::{ count::Count, currency_pair::CurrencyPair, currency_pair_id::CurrencyPairId, diff --git a/crates/astria-sequencer/src/sequencer.rs b/crates/astria-sequencer/src/sequencer.rs index 3b677b1866..05564a67a3 100644 --- a/crates/astria-sequencer/src/sequencer.rs +++ b/crates/astria-sequencer/src/sequencer.rs @@ -3,7 +3,7 @@ use std::time::Duration; use astria_core::{ generated::{ astria::sequencerblock::v1::sequencer_service_server::SequencerServiceServer, - connect::{ + price_feed::{ marketmap::v2::query_server::QueryServer as MarketMapQueryServer, oracle::v2::query_server::QueryServer as OracleQueryServer, service::v2::{ @@ -77,7 +77,7 @@ use crate::{ }, }; -const MAX_RETRIES_TO_CONNECT_TO_ORACLE_SIDECAR: u32 = 36; +const MAX_RETRIES_TO_CONNECT_TO_PRICE_FEED_SIDECAR: u32 = 36; pub struct Sequencer; @@ -156,15 +156,15 @@ impl Sequencer { } let mempool = Mempool::new(metrics, config.mempool_parked_max_tx_count); - let oracle_client = new_oracle_client(&config) + let price_feed_client = new_price_feed_client(&config) .await - .wrap_err("failed to create connected oracle client")?; + .wrap_err("failed to create connected price feed client")?; let app = App::new( snapshot, mempool.clone(), upgrades.clone(), config.cometbft_rpc_addr.clone(), - crate::app::vote_extension::Handler::new(oracle_client), + crate::app::vote_extension::Handler::new(price_feed_client), metrics, ) .await @@ -266,8 +266,8 @@ fn start_grpc_server( let ibc = penumbra_ibc::component::rpc::IbcQuery::::new(storage.clone()); let sequencer_api = SequencerServer::new(storage.clone(), mempool, upgrades); - let market_map_api = crate::grpc::connect::SequencerServer::new(storage.clone()); - let oracle_api = crate::grpc::connect::SequencerServer::new(storage.clone()); + let market_map_api = crate::grpc::price_feed::SequencerServer::new(storage.clone()); + let oracle_api = crate::grpc::price_feed::SequencerServer::new(storage.clone()); let cors_layer: CorsLayer = CorsLayer::permissive(); // TODO: setup HTTPS? @@ -333,68 +333,72 @@ fn spawn_signal_handler() -> SignalReceiver { } } -/// Returns a new Connect oracle client or `Ok(None)` if `config.no_oracle` is true. +/// Returns a new price feed client or `Ok(None)` if `config.no_price_feed` is true. /// -/// If `config.no_oracle` is false, returns `Ok(Some(...))` as soon as a successful response is -/// received from the oracle sidecar, or returns `Err` after a fixed number of failed re-attempts -/// (roughly equivalent to 5 minutes total). +/// If `config.no_price_feed` is false, returns `Ok(Some(...))` as soon as a successful response is +/// received from the price feed sidecar, or returns `Err` after a fixed number of failed +/// re-attempts (roughly equivalent to 5 minutes total). #[instrument(skip_all, err)] -async fn new_oracle_client(config: &Config) -> Result>> { - if config.no_oracle { +async fn new_price_feed_client(config: &Config) -> Result>> { + if config.no_price_feed { return Ok(None); } let uri: Uri = config - .oracle_grpc_addr + .price_feed_grpc_addr .parse() - .context("failed parsing oracle grpc address as Uri")?; + .context("failed parsing price feed grpc address as Uri")?; let endpoint = Endpoint::from(uri.clone()).timeout(Duration::from_millis( - config.oracle_client_timeout_milliseconds, + config.price_feed_client_timeout_milliseconds, )); - let retry_config = tryhard::RetryFutureConfig::new(MAX_RETRIES_TO_CONNECT_TO_ORACLE_SIDECAR) - .exponential_backoff(Duration::from_millis(100)) - .max_delay(Duration::from_secs(10)) - .on_retry( - |attempt, next_delay: Option, error: &eyre::Report| { - let wait_duration = next_delay - .map(humantime::format_duration) - .map(tracing::field::display); - warn!( - error = error.as_ref() as &dyn std::error::Error, - attempt, - wait_duration, - "failed to query oracle sidecar; retrying after backoff", - ); - async {} - }, - ); + let retry_config = + tryhard::RetryFutureConfig::new(MAX_RETRIES_TO_CONNECT_TO_PRICE_FEED_SIDECAR) + .exponential_backoff(Duration::from_millis(100)) + .max_delay(Duration::from_secs(10)) + .on_retry( + |attempt, next_delay: Option, error: &eyre::Report| { + let wait_duration = next_delay + .map(humantime::format_duration) + .map(tracing::field::display); + warn!( + error = error.as_ref() as &dyn std::error::Error, + attempt, + wait_duration, + "failed to query price feed oracle sidecar; retrying after backoff", + ); + async {} + }, + ); - let client = tryhard::retry_fn(|| connect_to_oracle(&endpoint, &uri)) + let client = tryhard::retry_fn(|| connect_to_price_feed_sidecar(&endpoint, &uri)) .with_config(retry_config) .await .wrap_err_with(|| { format!( - "failed to query oracle sidecar after {MAX_RETRIES_TO_CONNECT_TO_ORACLE_SIDECAR} \ - retries; giving up" + "failed to query price feed sidecar after \ + {MAX_RETRIES_TO_CONNECT_TO_PRICE_FEED_SIDECAR} retries; giving up" ) })?; Ok(Some(client)) } #[instrument(skip_all, err(level = tracing::Level::WARN))] -async fn connect_to_oracle(endpoint: &Endpoint, uri: &Uri) -> Result> { - let mut oracle_client = OracleClient::new( +async fn connect_to_price_feed_sidecar( + endpoint: &Endpoint, + uri: &Uri, +) -> Result> { + let mut client = OracleClient::new( endpoint .connect() .await - .wrap_err("failed to connect to oracle sidecar")?, + .wrap_err("failed to connect to price feed sidecar")?, ); - let _ = oracle_client + let _ = client .prices(QueryPricesRequest::default()) .await - .wrap_err("oracle sidecar responded with error to query for prices"); - debug!(uri = %uri, "oracle sidecar is reachable"); - Ok(oracle_client) + .wrap_err("price feed sidecar responded with error to query for prices"); + debug!(uri = %uri, "price feed sidecar is reachable"); + Ok(client) } #[cfg(test)] @@ -405,7 +409,7 @@ mod tests { #[tokio::test(start_paused = true)] async fn should_wait_while_unable_to_connect() { - // We only care about `no_oracle` and `oracle_grpc_addr` values - the others can be + // We only care about `no_price_feed` and `price_feed_grpc_addr` values - the others can be // meaningless. let config = Config { listen_addr: String::new(), @@ -419,20 +423,20 @@ mod tests { pretty_print: true, upgrades_filepath: PathBuf::new(), cometbft_rpc_addr: String::new(), - no_oracle: false, - oracle_grpc_addr: "http://127.0.0.1:8081".to_string(), - oracle_client_timeout_milliseconds: 1, + no_price_feed: false, + price_feed_grpc_addr: "http://127.0.0.1:8081".to_string(), + price_feed_client_timeout_milliseconds: 1, mempool_parked_max_tx_count: 1, }; let start = tokio::time::Instant::now(); - let error = new_oracle_client(&config).await.unwrap_err(); + let error = new_price_feed_client(&config).await.unwrap_err(); assert!(start.elapsed() > Duration::from_secs(300)); assert_eq!( error.to_string(), format!( - "failed to query oracle sidecar after {MAX_RETRIES_TO_CONNECT_TO_ORACLE_SIDECAR} \ - retries; giving up" + "failed to query price feed sidecar after \ + {MAX_RETRIES_TO_CONNECT_TO_PRICE_FEED_SIDECAR} retries; giving up" ) ); } diff --git a/crates/astria-sequencer/src/storage/stored_value.rs b/crates/astria-sequencer/src/storage/stored_value.rs index a496096769..acbf6ffb9a 100644 --- a/crates/astria-sequencer/src/storage/stored_value.rs +++ b/crates/astria-sequencer/src/storage/stored_value.rs @@ -20,8 +20,8 @@ pub(crate) enum StoredValue<'a> { App(crate::app::storage::Value<'a>), Grpc(crate::grpc::storage::Value<'a>), Upgrades(crate::upgrades::storage::Value<'a>), - ConnectMarketMap(crate::connect::market_map::storage::Value<'a>), - ConnectOracle(crate::connect::oracle::storage::Value<'a>), + PriceFeedMarketMap(crate::oracles::price_feed::market_map::storage::Value<'a>), + PriceFeedOracle(crate::oracles::price_feed::oracle::storage::Value<'a>), } impl<'a> StoredValue<'a> { diff --git a/dev/values/validators/all-without-native.yml b/dev/values/validators/all-without-native.yml index 66eeba1a55..37356a4c38 100644 --- a/dev/values/validators/all-without-native.yml +++ b/dev/values/validators/all-without-native.yml @@ -21,7 +21,7 @@ genesis: genesisAccounts: [] sequencer: - oracle: + priceFeed: enabled: true metrics: enabled: true diff --git a/dev/values/validators/all.yml b/dev/values/validators/all.yml index b34216ce3f..39bf2a3e73 100644 --- a/dev/values/validators/all.yml +++ b/dev/values/validators/all.yml @@ -39,7 +39,7 @@ genesis: balance: "69000000" sequencer: - oracle: + priceFeed: enabled: true metrics: enabled: true diff --git a/proto/protocolapis/astria/protocol/genesis/v1/types.proto b/proto/protocolapis/astria/protocol/genesis/v1/types.proto index d6eb4f26bf..560a5fae02 100644 --- a/proto/protocolapis/astria/protocol/genesis/v1/types.proto +++ b/proto/protocolapis/astria/protocol/genesis/v1/types.proto @@ -4,8 +4,8 @@ package astria.protocol.genesis.v1; import "astria/primitive/v1/types.proto"; import "astria/protocol/fees/v1/types.proto"; -import "connect/marketmap/v2/genesis.proto"; -import "connect/oracle/v2/genesis.proto"; +import "price_feed/marketmap/v2/genesis.proto"; +import "price_feed/oracle/v2/genesis.proto"; message GenesisAppState { string chain_id = 1; @@ -18,7 +18,7 @@ message GenesisAppState { IbcParameters ibc_parameters = 8; repeated string allowed_fee_assets = 9; GenesisFees fees = 10; - ConnectGenesis connect = 11; + PriceFeedGenesis price_feed = 11; } message Account { @@ -63,7 +63,7 @@ message GenesisFees { astria.protocol.fees.v1.RemoveCurrencyPairsFeeComponents remove_currency_pairs = 16; } -message ConnectGenesis { - connect.marketmap.v2.GenesisState market_map = 1; - connect.oracle.v2.GenesisState oracle = 2; +message PriceFeedGenesis { + price_feed.marketmap.v2.GenesisState market_map = 1; + price_feed.oracle.v2.GenesisState oracle = 2; } diff --git a/proto/protocolapis/astria/protocol/connect/v1/transaction.proto b/proto/protocolapis/astria/protocol/price_feed/v1/transaction.proto similarity index 70% rename from proto/protocolapis/astria/protocol/connect/v1/transaction.proto rename to proto/protocolapis/astria/protocol/price_feed/v1/transaction.proto index b0b09ecbdb..cf622a0806 100644 --- a/proto/protocolapis/astria/protocol/connect/v1/transaction.proto +++ b/proto/protocolapis/astria/protocol/price_feed/v1/transaction.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package astria.protocol.connect.v1; +package astria.protocol.price_feed.v1; import "astria_vendored/tendermint/abci/types.proto"; -import "connect/types/v2/currency_pair.proto"; +import "price_feed/types/v2/currency_pair.proto"; message ExtendedCommitInfoWithCurrencyPairMapping { astria_vendored.tendermint.abci.ExtendedCommitInfo extended_commit_info = 1; @@ -12,6 +12,6 @@ message ExtendedCommitInfoWithCurrencyPairMapping { message IdWithCurrencyPair { uint64 id = 1; - .connect.types.v2.CurrencyPair currency_pair = 2; + .price_feed.types.v2.CurrencyPair currency_pair = 2; uint64 decimals = 3; } diff --git a/proto/protocolapis/astria/protocol/transaction/v1/action.proto b/proto/protocolapis/astria/protocol/transaction/v1/action.proto index 03177e55cd..38a6718bcb 100644 --- a/proto/protocolapis/astria/protocol/transaction/v1/action.proto +++ b/proto/protocolapis/astria/protocol/transaction/v1/action.proto @@ -6,7 +6,7 @@ import "astria/primitive/v1/types.proto"; import "astria/protocol/fees/v1/types.proto"; import "astria_vendored/penumbra/core/component/ibc/v1/ibc.proto"; import "astria_vendored/tendermint/abci/types.proto"; -import "connect/types/v2/currency_pair.proto"; +import "price_feed/types/v2/currency_pair.proto"; message Action { oneof value { @@ -32,7 +32,7 @@ message Action { FeeChange fee_change = 55; IbcSudoChange ibc_sudo_change = 56; - // Oracle actions are defined on 71-80 + // Price feed actions are defined on 71-80 AddCurrencyPairs add_currency_pairs = 71; RemoveCurrencyPairs remove_currency_pairs = 72; } @@ -243,9 +243,9 @@ message IbcSudoChange { } message AddCurrencyPairs { - repeated connect.types.v2.CurrencyPair pairs = 1; + repeated price_feed.types.v2.CurrencyPair pairs = 1; } message RemoveCurrencyPairs { - repeated connect.types.v2.CurrencyPair pairs = 1; + repeated price_feed.types.v2.CurrencyPair pairs = 1; } diff --git a/proto/sequencerblockapis/astria/sequencerblock/v1/block.proto b/proto/sequencerblockapis/astria/sequencerblock/v1/block.proto index dd4f5e107d..7987f842c8 100644 --- a/proto/sequencerblockapis/astria/sequencerblock/v1/block.proto +++ b/proto/sequencerblockapis/astria/sequencerblock/v1/block.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package astria.sequencerblock.v1; import "astria/primitive/v1/types.proto"; -import "connect/types/v2/currency_pair.proto"; import "google/protobuf/timestamp.proto"; +import "price_feed/types/v2/currency_pair.proto"; // `RollupTransactions` are a sequence of opaque bytes together with a 32 byte // identifier of that rollup. @@ -147,7 +147,7 @@ message RollupData { oneof value { bytes sequenced_data = 1; Deposit deposit = 2; - OracleData oracle_data = 3; + PriceFeedData price_feed_data = 3; } } @@ -169,12 +169,12 @@ message ExtendedCommitInfoWithProof { astria.primitive.v1.Proof proof = 2; } -message OracleData { +message PriceFeedData { repeated Price prices = 1; } message Price { - connect.types.v2.CurrencyPair currency_pair = 1; + price_feed.types.v2.CurrencyPair currency_pair = 1; astria.primitive.v1.Uint128 price = 2; uint64 decimals = 3; } diff --git a/proto/upgrades/astria/upgrades/v1/upgrades.proto b/proto/upgrades/astria/upgrades/v1/upgrades.proto index c9d2bb2edd..68cfcfb5dd 100644 --- a/proto/upgrades/astria/upgrades/v1/upgrades.proto +++ b/proto/upgrades/astria/upgrades/v1/upgrades.proto @@ -21,15 +21,15 @@ message BaseUpgradeInfo { // Upgrade 1 of the Sequencer network. message Upgrade1 { - message ConnectOracleChange { - // The Connect oracle genesis data. - astria.protocol.genesis.v1.ConnectGenesis genesis = 1; + message PriceFeedChange { + // The price feed genesis data. + astria.protocol.genesis.v1.PriceFeedGenesis genesis = 1; } message ValidatorUpdateActionChange {} BaseUpgradeInfo base_info = 1; - ConnectOracleChange connect_oracle_change = 2; + PriceFeedChange price_feed_change = 2; ValidatorUpdateActionChange validator_update_action_change = 3; } diff --git a/proto/vendored/connect/abci/v2/vote_extensions.proto b/proto/vendored/price_feed/abci/v2/vote_extensions.proto similarity index 94% rename from proto/vendored/connect/abci/v2/vote_extensions.proto rename to proto/vendored/price_feed/abci/v2/vote_extensions.proto index 5fcdcf7f2b..ddbb02b089 100644 --- a/proto/vendored/connect/abci/v2/vote_extensions.proto +++ b/proto/vendored/price_feed/abci/v2/vote_extensions.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package connect.abci.v2; +package price_feed.abci.v2; option go_package = "github.com/skip-mev/connect/v2/abci/ve/types"; diff --git a/proto/vendored/connect/marketmap/v2/genesis.proto b/proto/vendored/price_feed/marketmap/v2/genesis.proto similarity index 82% rename from proto/vendored/connect/marketmap/v2/genesis.proto rename to proto/vendored/price_feed/marketmap/v2/genesis.proto index 3ce6bff2a0..e78c508d68 100644 --- a/proto/vendored/connect/marketmap/v2/genesis.proto +++ b/proto/vendored/price_feed/marketmap/v2/genesis.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package connect.marketmap.v2; +package price_feed.marketmap.v2; -import "connect/marketmap/v2/market.proto"; -import "connect/marketmap/v2/params.proto"; +import "price_feed/marketmap/v2/market.proto"; +import "price_feed/marketmap/v2/params.proto"; option go_package = "github.com/skip-mev/connect/v2/x/marketmap/types"; diff --git a/proto/vendored/connect/marketmap/v2/market.proto b/proto/vendored/price_feed/marketmap/v2/market.proto similarity index 92% rename from proto/vendored/connect/marketmap/v2/market.proto rename to proto/vendored/price_feed/marketmap/v2/market.proto index 0ceda1e520..d7f7887661 100644 --- a/proto/vendored/connect/marketmap/v2/market.proto +++ b/proto/vendored/price_feed/marketmap/v2/market.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package connect.marketmap.v2; +package price_feed.marketmap.v2; -import "connect/types/v2/currency_pair.proto"; +import "price_feed/types/v2/currency_pair.proto"; option go_package = "github.com/skip-mev/connect/v2/x/marketmap/types"; @@ -21,7 +21,7 @@ message Market { // providers required to consider the ticker valid. message Ticker { // CurrencyPair is the currency pair for this ticker. - connect.types.v2.CurrencyPair currency_pair = 1; + price_feed.types.v2.CurrencyPair currency_pair = 1; // Decimals is the number of decimal places for the ticker. The number of // decimal places is used to convert the price to a human-readable format. @@ -54,7 +54,7 @@ message ProviderConfig { // For example, if the desired Ticker is BTC/USD, this market could be reached // using: OffChainTicker = BTC/USDT NormalizeByPair = USDT/USD This field is // optional and nullable. - connect.types.v2.CurrencyPair normalize_by_pair = 3; + price_feed.types.v2.CurrencyPair normalize_by_pair = 3; // Invert is a boolean indicating if the BASE and QUOTE of the market should // be inverted. i.e. BASE -> QUOTE, QUOTE -> BASE diff --git a/proto/vendored/connect/marketmap/v2/params.proto b/proto/vendored/price_feed/marketmap/v2/params.proto similarity index 93% rename from proto/vendored/connect/marketmap/v2/params.proto rename to proto/vendored/price_feed/marketmap/v2/params.proto index b880804f07..8d7bccfb4c 100644 --- a/proto/vendored/connect/marketmap/v2/params.proto +++ b/proto/vendored/price_feed/marketmap/v2/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package connect.marketmap.v2; +package price_feed.marketmap.v2; option go_package = "github.com/skip-mev/connect/v2/x/marketmap/types"; diff --git a/proto/vendored/connect/marketmap/v2/query.proto b/proto/vendored/price_feed/marketmap/v2/query.proto similarity index 81% rename from proto/vendored/connect/marketmap/v2/query.proto rename to proto/vendored/price_feed/marketmap/v2/query.proto index 765dbf29d0..3a5131af1c 100644 --- a/proto/vendored/connect/marketmap/v2/query.proto +++ b/proto/vendored/price_feed/marketmap/v2/query.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package connect.marketmap.v2; +package price_feed.marketmap.v2; -import "connect/marketmap/v2/market.proto"; -import "connect/marketmap/v2/params.proto"; -import "connect/types/v2/currency_pair.proto"; import "google/api/annotations.proto"; +import "price_feed/marketmap/v2/market.proto"; +import "price_feed/marketmap/v2/params.proto"; +import "price_feed/types/v2/currency_pair.proto"; option go_package = "github.com/skip-mev/connect/v2/x/marketmap/types"; @@ -13,23 +13,23 @@ service Query { // MarketMap returns the full market map stored in the x/marketmap // module. rpc MarketMap(MarketMapRequest) returns (MarketMapResponse) { - option (google.api.http) = {get: "/connect/marketmap/v2/marketmap"}; + option (google.api.http) = {get: "/price_feed/marketmap/v2/marketmap"}; } // Market returns a market stored in the x/marketmap // module. rpc Market(MarketRequest) returns (MarketResponse) { - option (google.api.http) = {get: "/connect/marketmap/v2/market"}; + option (google.api.http) = {get: "/price_feed/marketmap/v2/market"}; } // LastUpdated returns the last height the market map was updated at. rpc LastUpdated(LastUpdatedRequest) returns (LastUpdatedResponse) { - option (google.api.http) = {get: "/connect/marketmap/v2/last_updated"}; + option (google.api.http) = {get: "/price_feed/marketmap/v2/last_updated"}; } // Params returns the current x/marketmap module parameters. rpc Params(ParamsRequest) returns (ParamsResponse) { - option (google.api.http) = {get: "/connect/marketmap/v2/params"}; + option (google.api.http) = {get: "/price_feed/marketmap/v2/params"}; } } @@ -57,7 +57,7 @@ message MarketMapResponse { message MarketRequest { // CurrencyPair is the currency pair associated with the market being // requested. - connect.types.v2.CurrencyPair currency_pair = 1; + price_feed.types.v2.CurrencyPair currency_pair = 1; } // MarketResponse is the query response for the Market query. diff --git a/proto/vendored/connect/oracle/v2/genesis.proto b/proto/vendored/price_feed/oracle/v2/genesis.proto similarity index 94% rename from proto/vendored/connect/oracle/v2/genesis.proto rename to proto/vendored/price_feed/oracle/v2/genesis.proto index fa371fa6e1..6376719ff9 100644 --- a/proto/vendored/connect/oracle/v2/genesis.proto +++ b/proto/vendored/price_feed/oracle/v2/genesis.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package connect.oracle.v2; +package price_feed.oracle.v2; -import "connect/types/v2/currency_pair.proto"; import "google/protobuf/timestamp.proto"; +import "price_feed/types/v2/currency_pair.proto"; option go_package = "github.com/skip-mev/connect/v2/x/oracle/types"; @@ -38,7 +38,7 @@ message CurrencyPairState { // CurrencyPair. message CurrencyPairGenesis { // The CurrencyPair to be added to module state - connect.types.v2.CurrencyPair currency_pair = 1; + price_feed.types.v2.CurrencyPair currency_pair = 1; // A genesis price if one exists (note this will be empty, unless it results // from forking the state of this module) QuotePrice currency_pair_price = 2; diff --git a/proto/vendored/connect/oracle/v2/query.proto b/proto/vendored/price_feed/oracle/v2/query.proto similarity index 83% rename from proto/vendored/connect/oracle/v2/query.proto rename to proto/vendored/price_feed/oracle/v2/query.proto index fbdd3e0e55..e143cf49d3 100644 --- a/proto/vendored/connect/oracle/v2/query.proto +++ b/proto/vendored/price_feed/oracle/v2/query.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package connect.oracle.v2; +package price_feed.oracle.v2; -import "connect/oracle/v2/genesis.proto"; -import "connect/types/v2/currency_pair.proto"; import "google/api/annotations.proto"; +import "price_feed/oracle/v2/genesis.proto"; +import "price_feed/types/v2/currency_pair.proto"; option go_package = "github.com/skip-mev/connect/v2/x/oracle/types"; @@ -11,17 +11,17 @@ option go_package = "github.com/skip-mev/connect/v2/x/oracle/types"; service Query { // Get all the currency pairs the x/oracle module is tracking price-data for. rpc GetAllCurrencyPairs(GetAllCurrencyPairsRequest) returns (GetAllCurrencyPairsResponse) { - option (google.api.http) = {get: "/connect/oracle/v2/get_all_tickers"}; + option (google.api.http) = {get: "/price_feed/oracle/v2/get_all_tickers"}; } // Given a CurrencyPair (or its identifier) return the latest QuotePrice for // that CurrencyPair. rpc GetPrice(GetPriceRequest) returns (GetPriceResponse) { - option (google.api.http) = {get: "/connect/oracle/v2/get_price"}; + option (google.api.http) = {get: "/price_feed/oracle/v2/get_price"}; } rpc GetPrices(GetPricesRequest) returns (GetPricesResponse) { - option (google.api.http) = {get: "/connect/oracle/v2/get_prices"}; + option (google.api.http) = {get: "/price_feed/oracle/v2/get_prices"}; } // Get the mapping of currency pair ID -> currency pair. This is useful for @@ -29,7 +29,7 @@ service Query { // the underlying currency pair from it. rpc GetCurrencyPairMapping(GetCurrencyPairMappingRequest) returns (GetCurrencyPairMappingResponse) { option (google.api.http) = { - get: "/connect/oracle/v2/get_currency_pair_mapping" + get: "/price_feed/oracle/v2/get_currency_pair_mapping" additional_bindings: [] }; } @@ -40,7 +40,7 @@ message GetAllCurrencyPairsRequest {} // GetAllCurrencyPairsResponse returns all CurrencyPairs that the module is // currently tracking. message GetAllCurrencyPairsResponse { - repeated connect.types.v2.CurrencyPair currency_pairs = 1; + repeated price_feed.types.v2.CurrencyPair currency_pairs = 1; } // GetPriceRequest takes an identifier for the @@ -84,5 +84,5 @@ message GetCurrencyPairMappingRequest {} message GetCurrencyPairMappingResponse { // currency_pair_mapping is a mapping of the id representing the currency pair // to the currency pair itself. - map currency_pair_mapping = 1; + map currency_pair_mapping = 1; } diff --git a/proto/vendored/connect/service/v2/oracle.proto b/proto/vendored/price_feed/service/v2/oracle.proto similarity index 83% rename from proto/vendored/connect/service/v2/oracle.proto rename to proto/vendored/price_feed/service/v2/oracle.proto index 1beb98f429..22334c9488 100644 --- a/proto/vendored/connect/service/v2/oracle.proto +++ b/proto/vendored/price_feed/service/v2/oracle.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package connect.service.v2; +package price_feed.service.v2; -import "connect/marketmap/v2/market.proto"; import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; +import "price_feed/marketmap/v2/market.proto"; option go_package = "github.com/skip-mev/connect/v2/service/servers/oracle/types"; @@ -11,19 +11,19 @@ option go_package = "github.com/skip-mev/connect/v2/service/servers/oracle/types service Oracle { // Prices defines a method for fetching the latest prices. rpc Prices(QueryPricesRequest) returns (QueryPricesResponse) { - option (google.api.http) = {get: "/connect/oracle/v2/prices"}; + option (google.api.http) = {get: "/price_feed/oracle/v2/prices"}; } // MarketMap defines a method for fetching the latest market map // configuration. rpc MarketMap(QueryMarketMapRequest) returns (QueryMarketMapResponse) { - option (google.api.http) = {get: "/connect/oracle/v2/marketmap"}; + option (google.api.http) = {get: "/price_feed/oracle/v2/marketmap"}; } // Version defines a method for fetching the current version of the oracle // service. rpc Version(QueryVersionRequest) returns (QueryVersionResponse) { - option (google.api.http) = {get: "/connect/oracle/v2/version"}; + option (google.api.http) = {get: "/price_feed/oracle/v2/version"}; } } @@ -48,7 +48,7 @@ message QueryMarketMapRequest {} // QueryMarketMapResponse defines the response type for the MarketMap method. message QueryMarketMapResponse { // MarketMap defines the current market map configuration. - connect.marketmap.v2.MarketMap market_map = 1; + price_feed.marketmap.v2.MarketMap market_map = 1; } // QueryVersionRequest defines the request type for the Version method. diff --git a/proto/vendored/connect/types/v2/currency_pair.proto b/proto/vendored/price_feed/types/v2/currency_pair.proto similarity index 90% rename from proto/vendored/connect/types/v2/currency_pair.proto rename to proto/vendored/price_feed/types/v2/currency_pair.proto index 67c2e86d12..11efe133f6 100644 --- a/proto/vendored/connect/types/v2/currency_pair.proto +++ b/proto/vendored/price_feed/types/v2/currency_pair.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package connect.types.v2; +package price_feed.types.v2; option go_package = "github.com/skip-mev/connect/v2/pkg/types"; diff --git a/tools/protobuf-compiler/src/main.rs b/tools/protobuf-compiler/src/main.rs index 93c68ef717..41c99d3e89 100644 --- a/tools/protobuf-compiler/src/main.rs +++ b/tools/protobuf-compiler/src/main.rs @@ -70,13 +70,13 @@ fn main() { .build_client(true) .build_server(true) .emit_rerun_if_changed(false) - .btree_map([".connect"]) + .btree_map([".price_feed"]) .bytes([ ".astria", ".astria_vendored.tendermint.abci", ".celestia", - ".connect", ".cosmos", + ".price_feed", ".tendermint", ]) .client_mod_attribute(".", "#[cfg(feature=\"client\")]") @@ -103,14 +103,14 @@ fn main() { pbjson_build::Builder::new() .register_descriptors(&descriptor_set) .unwrap() - .btree_map([".connect"]) + .btree_map([".price_feed"]) .out_dir(&out_dir) .build(&[ ".astria", ".astria_vendored", ".celestia", - ".connect", ".cosmos", + ".price_feed", ".tendermint", ]) .unwrap(); @@ -149,8 +149,8 @@ fn clean_non_astria_code(generated: &mut ContentMap) { !name.starts_with("astria.") && !name.starts_with("astria_vendored.") && !name.starts_with("celestia.") - && !name.starts_with("connect.") && !name.starts_with("cosmos.") + && !name.starts_with("price_feed.") && !name.starts_with("tendermint.") }) .cloned() From 43e6f1c11ca7eba45c9e33dff4885932b4977a01 Mon Sep 17 00:00:00 2001 From: Fraser Hutchison Date: Tue, 4 Feb 2025 17:10:32 +0000 Subject: [PATCH 2/2] undo rename of connect to price_feed in vendored protos --- .../generated/astria.protocol.genesis.v1.rs | 4 +- .../astria.protocol.price_feed.v1.rs | 2 +- .../astria.protocol.transaction.v1.rs | 6 +- .../src/generated/astria.sequencerblock.v1.rs | 2 +- ...ice_feed.abci.v2.rs => connect.abci.v2.rs} | 4 +- ...i.v2.serde.rs => connect.abci.v2.serde.rs} | 6 +- ...arketmap.v2.rs => connect.marketmap.v2.rs} | 82 +++++++++--------- ...serde.rs => connect.marketmap.v2.serde.rs} | 84 +++++++++---------- ...feed.oracle.v2.rs => connect.oracle.v2.rs} | 77 ++++++++--------- ...v2.serde.rs => connect.oracle.v2.serde.rs} | 72 ++++++++-------- ...ed.service.v2.rs => connect.service.v2.rs} | 44 +++++----- ...2.serde.rs => connect.service.v2.serde.rs} | 36 ++++---- ...e_feed.types.v2.rs => connect.types.v2.rs} | 4 +- ....v2.serde.rs => connect.types.v2.serde.rs} | 6 +- crates/astria-core/src/generated/mod.rs | 22 ++--- .../astria/protocol/genesis/v1/types.proto | 8 +- .../protocol/price_feed/v1/transaction.proto | 4 +- .../protocol/transaction/v1/action.proto | 12 +-- .../astria/sequencerblock/v1/block.proto | 4 +- .../abci/v2/vote_extensions.proto | 2 +- .../marketmap/v2/genesis.proto | 6 +- .../marketmap/v2/market.proto | 8 +- .../marketmap/v2/params.proto | 2 +- .../marketmap/v2/query.proto | 18 ++-- .../oracle/v2/genesis.proto | 6 +- .../oracle/v2/query.proto | 18 ++-- .../service/v2/oracle.proto | 12 +-- .../types/v2/currency_pair.proto | 2 +- tools/protobuf-compiler/src/main.rs | 10 +-- 29 files changed, 281 insertions(+), 282 deletions(-) rename crates/astria-core/src/generated/{price_feed.abci.v2.rs => connect.abci.v2.rs} (85%) rename crates/astria-core/src/generated/{price_feed.abci.v2.serde.rs => connect.abci.v2.serde.rs} (92%) rename crates/astria-core/src/generated/{price_feed.marketmap.v2.rs => connect.marketmap.v2.rs} (92%) rename crates/astria-core/src/generated/{price_feed.marketmap.v2.serde.rs => connect.marketmap.v2.serde.rs} (92%) rename crates/astria-core/src/generated/{price_feed.oracle.v2.rs => connect.oracle.v2.rs} (92%) rename crates/astria-core/src/generated/{price_feed.oracle.v2.serde.rs => connect.oracle.v2.serde.rs} (92%) rename crates/astria-core/src/generated/{price_feed.service.v2.rs => connect.service.v2.rs} (93%) rename crates/astria-core/src/generated/{price_feed.service.v2.serde.rs => connect.service.v2.serde.rs} (90%) rename crates/astria-core/src/generated/{price_feed.types.v2.rs => connect.types.v2.rs} (81%) rename crates/astria-core/src/generated/{price_feed.types.v2.serde.rs => connect.types.v2.serde.rs} (93%) rename proto/vendored/{price_feed => connect}/abci/v2/vote_extensions.proto (94%) rename proto/vendored/{price_feed => connect}/marketmap/v2/genesis.proto (82%) rename proto/vendored/{price_feed => connect}/marketmap/v2/market.proto (92%) rename proto/vendored/{price_feed => connect}/marketmap/v2/params.proto (93%) rename proto/vendored/{price_feed => connect}/marketmap/v2/query.proto (81%) rename proto/vendored/{price_feed => connect}/oracle/v2/genesis.proto (94%) rename proto/vendored/{price_feed => connect}/oracle/v2/query.proto (83%) rename proto/vendored/{price_feed => connect}/service/v2/oracle.proto (83%) rename proto/vendored/{price_feed => connect}/types/v2/currency_pair.proto (90%) diff --git a/crates/astria-core/src/generated/astria.protocol.genesis.v1.rs b/crates/astria-core/src/generated/astria.protocol.genesis.v1.rs index 3328c9e5ab..1dfe2d7ee1 100644 --- a/crates/astria-core/src/generated/astria.protocol.genesis.v1.rs +++ b/crates/astria-core/src/generated/astria.protocol.genesis.v1.rs @@ -164,11 +164,11 @@ impl ::prost::Name for GenesisFees { pub struct PriceFeedGenesis { #[prost(message, optional, tag = "1")] pub market_map: ::core::option::Option< - super::super::super::super::price_feed::marketmap::v2::GenesisState, + super::super::super::super::connect::marketmap::v2::GenesisState, >, #[prost(message, optional, tag = "2")] pub oracle: ::core::option::Option< - super::super::super::super::price_feed::oracle::v2::GenesisState, + super::super::super::super::connect::oracle::v2::GenesisState, >, } impl ::prost::Name for PriceFeedGenesis { diff --git a/crates/astria-core/src/generated/astria.protocol.price_feed.v1.rs b/crates/astria-core/src/generated/astria.protocol.price_feed.v1.rs index 79dfee8abe..7c56251fd7 100644 --- a/crates/astria-core/src/generated/astria.protocol.price_feed.v1.rs +++ b/crates/astria-core/src/generated/astria.protocol.price_feed.v1.rs @@ -22,7 +22,7 @@ pub struct IdWithCurrencyPair { pub id: u64, #[prost(message, optional, tag = "2")] pub currency_pair: ::core::option::Option< - super::super::super::super::price_feed::types::v2::CurrencyPair, + super::super::super::super::connect::types::v2::CurrencyPair, >, #[prost(uint64, tag = "3")] pub decimals: u64, diff --git a/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs b/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs index 3743d1fa3c..2b2eae1a89 100644 --- a/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs +++ b/crates/astria-core/src/generated/astria.protocol.transaction.v1.rs @@ -524,7 +524,7 @@ impl ::prost::Name for CurrencyPairsChange { pub struct CurrencyPairs { #[prost(message, repeated, tag = "1")] pub pairs: ::prost::alloc::vec::Vec< - super::super::super::super::price_feed::types::v2::CurrencyPair, + super::super::super::super::connect::types::v2::CurrencyPair, >, } impl ::prost::Name for CurrencyPairs { @@ -591,7 +591,7 @@ impl ::prost::Name for ChangeMarkets { pub struct Markets { #[prost(message, repeated, tag = "1")] pub markets: ::prost::alloc::vec::Vec< - super::super::super::super::price_feed::marketmap::v2::Market, + super::super::super::super::connect::marketmap::v2::Market, >, } impl ::prost::Name for Markets { @@ -608,7 +608,7 @@ pub struct UpdateMarketMapParams { /// Params defines the new parameters for the x/marketmap module. #[prost(message, optional, tag = "1")] pub params: ::core::option::Option< - super::super::super::super::price_feed::marketmap::v2::Params, + super::super::super::super::connect::marketmap::v2::Params, >, } impl ::prost::Name for UpdateMarketMapParams { diff --git a/crates/astria-core/src/generated/astria.sequencerblock.v1.rs b/crates/astria-core/src/generated/astria.sequencerblock.v1.rs index 3ad80f2fbf..9749749bdb 100644 --- a/crates/astria-core/src/generated/astria.sequencerblock.v1.rs +++ b/crates/astria-core/src/generated/astria.sequencerblock.v1.rs @@ -323,7 +323,7 @@ impl ::prost::Name for PriceFeedData { pub struct Price { #[prost(message, optional, tag = "1")] pub currency_pair: ::core::option::Option< - super::super::super::price_feed::types::v2::CurrencyPair, + super::super::super::connect::types::v2::CurrencyPair, >, #[prost(message, optional, tag = "2")] pub price: ::core::option::Option, diff --git a/crates/astria-core/src/generated/price_feed.abci.v2.rs b/crates/astria-core/src/generated/connect.abci.v2.rs similarity index 85% rename from crates/astria-core/src/generated/price_feed.abci.v2.rs rename to crates/astria-core/src/generated/connect.abci.v2.rs index f21f0270ab..6940f8594b 100644 --- a/crates/astria-core/src/generated/price_feed.abci.v2.rs +++ b/crates/astria-core/src/generated/connect.abci.v2.rs @@ -10,8 +10,8 @@ pub struct OracleVoteExtension { } impl ::prost::Name for OracleVoteExtension { const NAME: &'static str = "OracleVoteExtension"; - const PACKAGE: &'static str = "price_feed.abci.v2"; + const PACKAGE: &'static str = "connect.abci.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.abci.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.abci.v2.{}", Self::NAME) } } diff --git a/crates/astria-core/src/generated/price_feed.abci.v2.serde.rs b/crates/astria-core/src/generated/connect.abci.v2.serde.rs similarity index 92% rename from crates/astria-core/src/generated/price_feed.abci.v2.serde.rs rename to crates/astria-core/src/generated/connect.abci.v2.serde.rs index 855aac4327..b909661c94 100644 --- a/crates/astria-core/src/generated/price_feed.abci.v2.serde.rs +++ b/crates/astria-core/src/generated/connect.abci.v2.serde.rs @@ -9,7 +9,7 @@ impl serde::Serialize for OracleVoteExtension { if !self.prices.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.abci.v2.OracleVoteExtension", len)?; + let mut struct_ser = serializer.serialize_struct("connect.abci.v2.OracleVoteExtension", len)?; if !self.prices.is_empty() { let v: std::collections::HashMap<_, _> = self.prices.iter() .map(|(k, v)| (k, pbjson::private::base64::encode(v))).collect(); @@ -65,7 +65,7 @@ impl<'de> serde::Deserialize<'de> for OracleVoteExtension { type Value = OracleVoteExtension; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.abci.v2.OracleVoteExtension") + formatter.write_str("struct connect.abci.v2.OracleVoteExtension") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -91,6 +91,6 @@ impl<'de> serde::Deserialize<'de> for OracleVoteExtension { }) } } - deserializer.deserialize_struct("price_feed.abci.v2.OracleVoteExtension", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.abci.v2.OracleVoteExtension", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/price_feed.marketmap.v2.rs b/crates/astria-core/src/generated/connect.marketmap.v2.rs similarity index 92% rename from crates/astria-core/src/generated/price_feed.marketmap.v2.rs rename to crates/astria-core/src/generated/connect.marketmap.v2.rs index 89d3bda4b0..148e1e3db5 100644 --- a/crates/astria-core/src/generated/price_feed.marketmap.v2.rs +++ b/crates/astria-core/src/generated/connect.marketmap.v2.rs @@ -13,9 +13,9 @@ pub struct Market { } impl ::prost::Name for Market { const NAME: &'static str = "Market"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// Ticker represents a price feed for a given asset pair i.e. BTC/USD. The price @@ -46,9 +46,9 @@ pub struct Ticker { } impl ::prost::Name for Ticker { const NAME: &'static str = "Ticker"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -80,9 +80,9 @@ pub struct ProviderConfig { } impl ::prost::Name for ProviderConfig { const NAME: &'static str = "ProviderConfig"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// MarketMap maps ticker strings to their Markets. @@ -99,9 +99,9 @@ pub struct MarketMap { } impl ::prost::Name for MarketMap { const NAME: &'static str = "MarketMap"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// Params defines the parameters for the x/marketmap module. @@ -119,9 +119,9 @@ pub struct Params { } impl ::prost::Name for Params { const NAME: &'static str = "Params"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// GenesisState defines the x/marketmap module's genesis state. @@ -143,9 +143,9 @@ pub struct GenesisState { } impl ::prost::Name for GenesisState { const NAME: &'static str = "GenesisState"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// MarketMapRequest is the query request for the MarketMap query. @@ -155,9 +155,9 @@ impl ::prost::Name for GenesisState { pub struct MarketMapRequest {} impl ::prost::Name for MarketMapRequest { const NAME: &'static str = "MarketMapRequest"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// MarketMapResponse is the query response for the MarketMap query. @@ -179,9 +179,9 @@ pub struct MarketMapResponse { } impl ::prost::Name for MarketMapResponse { const NAME: &'static str = "MarketMapResponse"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// MarketRequest is the query request for the Market query. @@ -196,9 +196,9 @@ pub struct MarketRequest { } impl ::prost::Name for MarketRequest { const NAME: &'static str = "MarketRequest"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// MarketResponse is the query response for the Market query. @@ -211,9 +211,9 @@ pub struct MarketResponse { } impl ::prost::Name for MarketResponse { const NAME: &'static str = "MarketResponse"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// ParamsRequest is the request type for the Query/Params RPC method. @@ -222,9 +222,9 @@ impl ::prost::Name for MarketResponse { pub struct ParamsRequest {} impl ::prost::Name for ParamsRequest { const NAME: &'static str = "ParamsRequest"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// ParamsResponse is the response type for the Query/Params RPC method. @@ -236,9 +236,9 @@ pub struct ParamsResponse { } impl ::prost::Name for ParamsResponse { const NAME: &'static str = "ParamsResponse"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// LastUpdatedRequest is the request type for the Query/LastUpdated RPC @@ -248,9 +248,9 @@ impl ::prost::Name for ParamsResponse { pub struct LastUpdatedRequest {} impl ::prost::Name for LastUpdatedRequest { const NAME: &'static str = "LastUpdatedRequest"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// LastUpdatedResponse is the response type for the Query/LastUpdated RPC @@ -263,9 +263,9 @@ pub struct LastUpdatedResponse { } impl ::prost::Name for LastUpdatedResponse { const NAME: &'static str = "LastUpdatedResponse"; - const PACKAGE: &'static str = "price_feed.marketmap.v2"; + const PACKAGE: &'static str = "connect.marketmap.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.marketmap.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.marketmap.v2.{}", Self::NAME) } } /// Generated client implementations. @@ -375,11 +375,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.marketmap.v2.Query/MarketMap", + "/connect.marketmap.v2.Query/MarketMap", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("price_feed.marketmap.v2.Query", "MarketMap")); + .insert(GrpcMethod::new("connect.marketmap.v2.Query", "MarketMap")); self.inner.unary(req, path, codec).await } /// Market returns a market stored in the x/marketmap @@ -399,11 +399,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.marketmap.v2.Query/Market", + "/connect.marketmap.v2.Query/Market", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("price_feed.marketmap.v2.Query", "Market")); + .insert(GrpcMethod::new("connect.marketmap.v2.Query", "Market")); self.inner.unary(req, path, codec).await } /// LastUpdated returns the last height the market map was updated at. @@ -425,11 +425,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.marketmap.v2.Query/LastUpdated", + "/connect.marketmap.v2.Query/LastUpdated", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("price_feed.marketmap.v2.Query", "LastUpdated")); + .insert(GrpcMethod::new("connect.marketmap.v2.Query", "LastUpdated")); self.inner.unary(req, path, codec).await } /// Params returns the current x/marketmap module parameters. @@ -448,11 +448,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.marketmap.v2.Query/Params", + "/connect.marketmap.v2.Query/Params", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("price_feed.marketmap.v2.Query", "Params")); + .insert(GrpcMethod::new("connect.marketmap.v2.Query", "Params")); self.inner.unary(req, path, codec).await } } @@ -574,7 +574,7 @@ pub mod query_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/price_feed.marketmap.v2.Query/MarketMap" => { + "/connect.marketmap.v2.Query/MarketMap" => { #[allow(non_camel_case_types)] struct MarketMapSvc(pub Arc); impl tonic::server::UnaryService @@ -618,7 +618,7 @@ pub mod query_server { }; Box::pin(fut) } - "/price_feed.marketmap.v2.Query/Market" => { + "/connect.marketmap.v2.Query/Market" => { #[allow(non_camel_case_types)] struct MarketSvc(pub Arc); impl tonic::server::UnaryService @@ -662,7 +662,7 @@ pub mod query_server { }; Box::pin(fut) } - "/price_feed.marketmap.v2.Query/LastUpdated" => { + "/connect.marketmap.v2.Query/LastUpdated" => { #[allow(non_camel_case_types)] struct LastUpdatedSvc(pub Arc); impl tonic::server::UnaryService @@ -706,7 +706,7 @@ pub mod query_server { }; Box::pin(fut) } - "/price_feed.marketmap.v2.Query/Params" => { + "/connect.marketmap.v2.Query/Params" => { #[allow(non_camel_case_types)] struct ParamsSvc(pub Arc); impl tonic::server::UnaryService @@ -788,6 +788,6 @@ pub mod query_server { } } impl tonic::server::NamedService for QueryServer { - const NAME: &'static str = "price_feed.marketmap.v2.Query"; + const NAME: &'static str = "connect.marketmap.v2.Query"; } } diff --git a/crates/astria-core/src/generated/price_feed.marketmap.v2.serde.rs b/crates/astria-core/src/generated/connect.marketmap.v2.serde.rs similarity index 92% rename from crates/astria-core/src/generated/price_feed.marketmap.v2.serde.rs rename to crates/astria-core/src/generated/connect.marketmap.v2.serde.rs index c037136a5c..f73db9da9b 100644 --- a/crates/astria-core/src/generated/price_feed.marketmap.v2.serde.rs +++ b/crates/astria-core/src/generated/connect.marketmap.v2.serde.rs @@ -15,7 +15,7 @@ impl serde::Serialize for GenesisState { if self.params.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.GenesisState", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.GenesisState", len)?; if let Some(v) = self.market_map.as_ref() { struct_ser.serialize_field("marketMap", v)?; } @@ -84,7 +84,7 @@ impl<'de> serde::Deserialize<'de> for GenesisState { type Value = GenesisState; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.GenesisState") + formatter.write_str("struct connect.marketmap.v2.GenesisState") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -125,7 +125,7 @@ impl<'de> serde::Deserialize<'de> for GenesisState { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.GenesisState", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.GenesisState", FIELDS, GeneratedVisitor) } } impl serde::Serialize for LastUpdatedRequest { @@ -136,7 +136,7 @@ impl serde::Serialize for LastUpdatedRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.LastUpdatedRequest", len)?; + let struct_ser = serializer.serialize_struct("connect.marketmap.v2.LastUpdatedRequest", len)?; struct_ser.end() } } @@ -182,7 +182,7 @@ impl<'de> serde::Deserialize<'de> for LastUpdatedRequest { type Value = LastUpdatedRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.LastUpdatedRequest") + formatter.write_str("struct connect.marketmap.v2.LastUpdatedRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -196,7 +196,7 @@ impl<'de> serde::Deserialize<'de> for LastUpdatedRequest { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.LastUpdatedRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.LastUpdatedRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for LastUpdatedResponse { @@ -210,7 +210,7 @@ impl serde::Serialize for LastUpdatedResponse { if self.last_updated != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.LastUpdatedResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.LastUpdatedResponse", len)?; if self.last_updated != 0 { #[allow(clippy::needless_borrow)] struct_ser.serialize_field("lastUpdated", ToString::to_string(&self.last_updated).as_str())?; @@ -266,7 +266,7 @@ impl<'de> serde::Deserialize<'de> for LastUpdatedResponse { type Value = LastUpdatedResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.LastUpdatedResponse") + formatter.write_str("struct connect.marketmap.v2.LastUpdatedResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -291,7 +291,7 @@ impl<'de> serde::Deserialize<'de> for LastUpdatedResponse { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.LastUpdatedResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.LastUpdatedResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for Market { @@ -308,7 +308,7 @@ impl serde::Serialize for Market { if !self.provider_configs.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.Market", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.Market", len)?; if let Some(v) = self.ticker.as_ref() { struct_ser.serialize_field("ticker", v)?; } @@ -369,7 +369,7 @@ impl<'de> serde::Deserialize<'de> for Market { type Value = Market; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.Market") + formatter.write_str("struct connect.marketmap.v2.Market") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -400,7 +400,7 @@ impl<'de> serde::Deserialize<'de> for Market { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.Market", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.Market", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketMap { @@ -414,7 +414,7 @@ impl serde::Serialize for MarketMap { if !self.markets.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketMap", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketMap", len)?; if !self.markets.is_empty() { struct_ser.serialize_field("markets", &self.markets)?; } @@ -468,7 +468,7 @@ impl<'de> serde::Deserialize<'de> for MarketMap { type Value = MarketMap; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.MarketMap") + formatter.write_str("struct connect.marketmap.v2.MarketMap") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -493,7 +493,7 @@ impl<'de> serde::Deserialize<'de> for MarketMap { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.MarketMap", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.MarketMap", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketMapRequest { @@ -504,7 +504,7 @@ impl serde::Serialize for MarketMapRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketMapRequest", len)?; + let struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketMapRequest", len)?; struct_ser.end() } } @@ -550,7 +550,7 @@ impl<'de> serde::Deserialize<'de> for MarketMapRequest { type Value = MarketMapRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.MarketMapRequest") + formatter.write_str("struct connect.marketmap.v2.MarketMapRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -564,7 +564,7 @@ impl<'de> serde::Deserialize<'de> for MarketMapRequest { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.MarketMapRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.MarketMapRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketMapResponse { @@ -584,7 +584,7 @@ impl serde::Serialize for MarketMapResponse { if !self.chain_id.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketMapResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketMapResponse", len)?; if let Some(v) = self.market_map.as_ref() { struct_ser.serialize_field("marketMap", v)?; } @@ -654,7 +654,7 @@ impl<'de> serde::Deserialize<'de> for MarketMapResponse { type Value = MarketMapResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.MarketMapResponse") + formatter.write_str("struct connect.marketmap.v2.MarketMapResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -695,7 +695,7 @@ impl<'de> serde::Deserialize<'de> for MarketMapResponse { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.MarketMapResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.MarketMapResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketRequest { @@ -709,7 +709,7 @@ impl serde::Serialize for MarketRequest { if self.currency_pair.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketRequest", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketRequest", len)?; if let Some(v) = self.currency_pair.as_ref() { struct_ser.serialize_field("currencyPair", v)?; } @@ -764,7 +764,7 @@ impl<'de> serde::Deserialize<'de> for MarketRequest { type Value = MarketRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.MarketRequest") + formatter.write_str("struct connect.marketmap.v2.MarketRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -787,7 +787,7 @@ impl<'de> serde::Deserialize<'de> for MarketRequest { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.MarketRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.MarketRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for MarketResponse { @@ -801,7 +801,7 @@ impl serde::Serialize for MarketResponse { if self.market.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.MarketResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.MarketResponse", len)?; if let Some(v) = self.market.as_ref() { struct_ser.serialize_field("market", v)?; } @@ -855,7 +855,7 @@ impl<'de> serde::Deserialize<'de> for MarketResponse { type Value = MarketResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.MarketResponse") + formatter.write_str("struct connect.marketmap.v2.MarketResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -878,7 +878,7 @@ impl<'de> serde::Deserialize<'de> for MarketResponse { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.MarketResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.MarketResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for Params { @@ -895,7 +895,7 @@ impl serde::Serialize for Params { if !self.admin.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.Params", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.Params", len)?; if !self.market_authorities.is_empty() { struct_ser.serialize_field("marketAuthorities", &self.market_authorities)?; } @@ -956,7 +956,7 @@ impl<'de> serde::Deserialize<'de> for Params { type Value = Params; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.Params") + formatter.write_str("struct connect.marketmap.v2.Params") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -987,7 +987,7 @@ impl<'de> serde::Deserialize<'de> for Params { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.Params", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.Params", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ParamsRequest { @@ -998,7 +998,7 @@ impl serde::Serialize for ParamsRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.ParamsRequest", len)?; + let struct_ser = serializer.serialize_struct("connect.marketmap.v2.ParamsRequest", len)?; struct_ser.end() } } @@ -1044,7 +1044,7 @@ impl<'de> serde::Deserialize<'de> for ParamsRequest { type Value = ParamsRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.ParamsRequest") + formatter.write_str("struct connect.marketmap.v2.ParamsRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1058,7 +1058,7 @@ impl<'de> serde::Deserialize<'de> for ParamsRequest { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.ParamsRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.ParamsRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ParamsResponse { @@ -1072,7 +1072,7 @@ impl serde::Serialize for ParamsResponse { if self.params.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.ParamsResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.ParamsResponse", len)?; if let Some(v) = self.params.as_ref() { struct_ser.serialize_field("params", v)?; } @@ -1126,7 +1126,7 @@ impl<'de> serde::Deserialize<'de> for ParamsResponse { type Value = ParamsResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.ParamsResponse") + formatter.write_str("struct connect.marketmap.v2.ParamsResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1149,7 +1149,7 @@ impl<'de> serde::Deserialize<'de> for ParamsResponse { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.ParamsResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.ParamsResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for ProviderConfig { @@ -1175,7 +1175,7 @@ impl serde::Serialize for ProviderConfig { if !self.metadata_json.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.ProviderConfig", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.ProviderConfig", len)?; if !self.name.is_empty() { struct_ser.serialize_field("name", &self.name)?; } @@ -1256,7 +1256,7 @@ impl<'de> serde::Deserialize<'de> for ProviderConfig { type Value = ProviderConfig; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.ProviderConfig") + formatter.write_str("struct connect.marketmap.v2.ProviderConfig") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1311,7 +1311,7 @@ impl<'de> serde::Deserialize<'de> for ProviderConfig { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.ProviderConfig", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.ProviderConfig", FIELDS, GeneratedVisitor) } } impl serde::Serialize for Ticker { @@ -1337,7 +1337,7 @@ impl serde::Serialize for Ticker { if !self.metadata_json.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.marketmap.v2.Ticker", len)?; + let mut struct_ser = serializer.serialize_struct("connect.marketmap.v2.Ticker", len)?; if let Some(v) = self.currency_pair.as_ref() { struct_ser.serialize_field("currencyPair", v)?; } @@ -1420,7 +1420,7 @@ impl<'de> serde::Deserialize<'de> for Ticker { type Value = Ticker; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.marketmap.v2.Ticker") + formatter.write_str("struct connect.marketmap.v2.Ticker") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1479,6 +1479,6 @@ impl<'de> serde::Deserialize<'de> for Ticker { }) } } - deserializer.deserialize_struct("price_feed.marketmap.v2.Ticker", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.marketmap.v2.Ticker", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/price_feed.oracle.v2.rs b/crates/astria-core/src/generated/connect.oracle.v2.rs similarity index 92% rename from crates/astria-core/src/generated/price_feed.oracle.v2.rs rename to crates/astria-core/src/generated/connect.oracle.v2.rs index 95f8897896..0815919721 100644 --- a/crates/astria-core/src/generated/price_feed.oracle.v2.rs +++ b/crates/astria-core/src/generated/connect.oracle.v2.rs @@ -16,9 +16,9 @@ pub struct QuotePrice { } impl ::prost::Name for QuotePrice { const NAME: &'static str = "QuotePrice"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// CurrencyPairState represents the stateful information tracked by the x/oracle @@ -39,9 +39,9 @@ pub struct CurrencyPairState { } impl ::prost::Name for CurrencyPairState { const NAME: &'static str = "CurrencyPairState"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// CurrencyPairGenesis is the information necessary for initialization of a @@ -66,9 +66,9 @@ pub struct CurrencyPairGenesis { } impl ::prost::Name for CurrencyPairGenesis { const NAME: &'static str = "CurrencyPairGenesis"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// GenesisState is the genesis-state for the x/oracle module, it takes a set of @@ -87,9 +87,9 @@ pub struct GenesisState { } impl ::prost::Name for GenesisState { const NAME: &'static str = "GenesisState"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -97,9 +97,9 @@ impl ::prost::Name for GenesisState { pub struct GetAllCurrencyPairsRequest {} impl ::prost::Name for GetAllCurrencyPairsRequest { const NAME: &'static str = "GetAllCurrencyPairsRequest"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// GetAllCurrencyPairsResponse returns all CurrencyPairs that the module is @@ -112,9 +112,9 @@ pub struct GetAllCurrencyPairsResponse { } impl ::prost::Name for GetAllCurrencyPairsResponse { const NAME: &'static str = "GetAllCurrencyPairsResponse"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// GetPriceRequest takes an identifier for the @@ -128,9 +128,9 @@ pub struct GetPriceRequest { } impl ::prost::Name for GetPriceRequest { const NAME: &'static str = "GetPriceRequest"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// GetPriceResponse is the response from the GetPrice grpc method exposed from @@ -155,9 +155,9 @@ pub struct GetPriceResponse { } impl ::prost::Name for GetPriceResponse { const NAME: &'static str = "GetPriceResponse"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// GetPricesRequest takes an identifier for the CurrencyPair @@ -170,9 +170,9 @@ pub struct GetPricesRequest { } impl ::prost::Name for GetPricesRequest { const NAME: &'static str = "GetPricesRequest"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// GetPricesResponse is the response from the GetPrices grpc method exposed from @@ -185,9 +185,9 @@ pub struct GetPricesResponse { } impl ::prost::Name for GetPricesResponse { const NAME: &'static str = "GetPricesResponse"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// GetCurrencyPairMappingRequest is the GetCurrencyPairMapping request type. @@ -196,9 +196,9 @@ impl ::prost::Name for GetPricesResponse { pub struct GetCurrencyPairMappingRequest {} impl ::prost::Name for GetCurrencyPairMappingRequest { const NAME: &'static str = "GetCurrencyPairMappingRequest"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// GetCurrencyPairMappingResponse is the GetCurrencyPairMapping response type. @@ -215,9 +215,9 @@ pub struct GetCurrencyPairMappingResponse { } impl ::prost::Name for GetCurrencyPairMappingResponse { const NAME: &'static str = "GetCurrencyPairMappingResponse"; - const PACKAGE: &'static str = "price_feed.oracle.v2"; + const PACKAGE: &'static str = "connect.oracle.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.oracle.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.oracle.v2.{}", Self::NAME) } } /// Generated client implementations. @@ -326,12 +326,12 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.oracle.v2.Query/GetAllCurrencyPairs", + "/connect.oracle.v2.Query/GetAllCurrencyPairs", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new("price_feed.oracle.v2.Query", "GetAllCurrencyPairs"), + GrpcMethod::new("connect.oracle.v2.Query", "GetAllCurrencyPairs"), ); self.inner.unary(req, path, codec).await } @@ -355,11 +355,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.oracle.v2.Query/GetPrice", + "/connect.oracle.v2.Query/GetPrice", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("price_feed.oracle.v2.Query", "GetPrice")); + .insert(GrpcMethod::new("connect.oracle.v2.Query", "GetPrice")); self.inner.unary(req, path, codec).await } pub async fn get_prices( @@ -380,11 +380,11 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.oracle.v2.Query/GetPrices", + "/connect.oracle.v2.Query/GetPrices", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("price_feed.oracle.v2.Query", "GetPrices")); + .insert(GrpcMethod::new("connect.oracle.v2.Query", "GetPrices")); self.inner.unary(req, path, codec).await } /// Get the mapping of currency pair ID -> currency pair. This is useful for @@ -408,15 +408,12 @@ pub mod query_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.oracle.v2.Query/GetCurrencyPairMapping", + "/connect.oracle.v2.Query/GetCurrencyPairMapping", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new( - "price_feed.oracle.v2.Query", - "GetCurrencyPairMapping", - ), + GrpcMethod::new("connect.oracle.v2.Query", "GetCurrencyPairMapping"), ); self.inner.unary(req, path, codec).await } @@ -545,7 +542,7 @@ pub mod query_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/price_feed.oracle.v2.Query/GetAllCurrencyPairs" => { + "/connect.oracle.v2.Query/GetAllCurrencyPairs" => { #[allow(non_camel_case_types)] struct GetAllCurrencyPairsSvc(pub Arc); impl< @@ -591,7 +588,7 @@ pub mod query_server { }; Box::pin(fut) } - "/price_feed.oracle.v2.Query/GetPrice" => { + "/connect.oracle.v2.Query/GetPrice" => { #[allow(non_camel_case_types)] struct GetPriceSvc(pub Arc); impl tonic::server::UnaryService @@ -635,7 +632,7 @@ pub mod query_server { }; Box::pin(fut) } - "/price_feed.oracle.v2.Query/GetPrices" => { + "/connect.oracle.v2.Query/GetPrices" => { #[allow(non_camel_case_types)] struct GetPricesSvc(pub Arc); impl tonic::server::UnaryService @@ -679,7 +676,7 @@ pub mod query_server { }; Box::pin(fut) } - "/price_feed.oracle.v2.Query/GetCurrencyPairMapping" => { + "/connect.oracle.v2.Query/GetCurrencyPairMapping" => { #[allow(non_camel_case_types)] struct GetCurrencyPairMappingSvc(pub Arc); impl< @@ -764,6 +761,6 @@ pub mod query_server { } } impl tonic::server::NamedService for QueryServer { - const NAME: &'static str = "price_feed.oracle.v2.Query"; + const NAME: &'static str = "connect.oracle.v2.Query"; } } diff --git a/crates/astria-core/src/generated/price_feed.oracle.v2.serde.rs b/crates/astria-core/src/generated/connect.oracle.v2.serde.rs similarity index 92% rename from crates/astria-core/src/generated/price_feed.oracle.v2.serde.rs rename to crates/astria-core/src/generated/connect.oracle.v2.serde.rs index 87f087798d..5bb4c9fa6b 100644 --- a/crates/astria-core/src/generated/price_feed.oracle.v2.serde.rs +++ b/crates/astria-core/src/generated/connect.oracle.v2.serde.rs @@ -18,7 +18,7 @@ impl serde::Serialize for CurrencyPairGenesis { if self.id != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.CurrencyPairGenesis", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.CurrencyPairGenesis", len)?; if let Some(v) = self.currency_pair.as_ref() { struct_ser.serialize_field("currencyPair", v)?; } @@ -94,7 +94,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPairGenesis { type Value = CurrencyPairGenesis; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.CurrencyPairGenesis") + formatter.write_str("struct connect.oracle.v2.CurrencyPairGenesis") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -145,7 +145,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPairGenesis { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.CurrencyPairGenesis", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.CurrencyPairGenesis", FIELDS, GeneratedVisitor) } } impl serde::Serialize for CurrencyPairState { @@ -165,7 +165,7 @@ impl serde::Serialize for CurrencyPairState { if self.id != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.CurrencyPairState", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.CurrencyPairState", len)?; if let Some(v) = self.price.as_ref() { struct_ser.serialize_field("price", v)?; } @@ -233,7 +233,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPairState { type Value = CurrencyPairState; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.CurrencyPairState") + formatter.write_str("struct connect.oracle.v2.CurrencyPairState") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -276,7 +276,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPairState { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.CurrencyPairState", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.CurrencyPairState", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GenesisState { @@ -293,7 +293,7 @@ impl serde::Serialize for GenesisState { if self.next_id != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GenesisState", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GenesisState", len)?; if !self.currency_pair_genesis.is_empty() { struct_ser.serialize_field("currencyPairGenesis", &self.currency_pair_genesis)?; } @@ -356,7 +356,7 @@ impl<'de> serde::Deserialize<'de> for GenesisState { type Value = GenesisState; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.GenesisState") + formatter.write_str("struct connect.oracle.v2.GenesisState") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -389,7 +389,7 @@ impl<'de> serde::Deserialize<'de> for GenesisState { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.GenesisState", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.GenesisState", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetAllCurrencyPairsRequest { @@ -400,7 +400,7 @@ impl serde::Serialize for GetAllCurrencyPairsRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetAllCurrencyPairsRequest", len)?; + let struct_ser = serializer.serialize_struct("connect.oracle.v2.GetAllCurrencyPairsRequest", len)?; struct_ser.end() } } @@ -446,7 +446,7 @@ impl<'de> serde::Deserialize<'de> for GetAllCurrencyPairsRequest { type Value = GetAllCurrencyPairsRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.GetAllCurrencyPairsRequest") + formatter.write_str("struct connect.oracle.v2.GetAllCurrencyPairsRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -460,7 +460,7 @@ impl<'de> serde::Deserialize<'de> for GetAllCurrencyPairsRequest { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.GetAllCurrencyPairsRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.GetAllCurrencyPairsRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetAllCurrencyPairsResponse { @@ -474,7 +474,7 @@ impl serde::Serialize for GetAllCurrencyPairsResponse { if !self.currency_pairs.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetAllCurrencyPairsResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetAllCurrencyPairsResponse", len)?; if !self.currency_pairs.is_empty() { struct_ser.serialize_field("currencyPairs", &self.currency_pairs)?; } @@ -529,7 +529,7 @@ impl<'de> serde::Deserialize<'de> for GetAllCurrencyPairsResponse { type Value = GetAllCurrencyPairsResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.GetAllCurrencyPairsResponse") + formatter.write_str("struct connect.oracle.v2.GetAllCurrencyPairsResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -552,7 +552,7 @@ impl<'de> serde::Deserialize<'de> for GetAllCurrencyPairsResponse { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.GetAllCurrencyPairsResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.GetAllCurrencyPairsResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetCurrencyPairMappingRequest { @@ -563,7 +563,7 @@ impl serde::Serialize for GetCurrencyPairMappingRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetCurrencyPairMappingRequest", len)?; + let struct_ser = serializer.serialize_struct("connect.oracle.v2.GetCurrencyPairMappingRequest", len)?; struct_ser.end() } } @@ -609,7 +609,7 @@ impl<'de> serde::Deserialize<'de> for GetCurrencyPairMappingRequest { type Value = GetCurrencyPairMappingRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.GetCurrencyPairMappingRequest") + formatter.write_str("struct connect.oracle.v2.GetCurrencyPairMappingRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -623,7 +623,7 @@ impl<'de> serde::Deserialize<'de> for GetCurrencyPairMappingRequest { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.GetCurrencyPairMappingRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.GetCurrencyPairMappingRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetCurrencyPairMappingResponse { @@ -637,7 +637,7 @@ impl serde::Serialize for GetCurrencyPairMappingResponse { if !self.currency_pair_mapping.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetCurrencyPairMappingResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetCurrencyPairMappingResponse", len)?; if !self.currency_pair_mapping.is_empty() { struct_ser.serialize_field("currencyPairMapping", &self.currency_pair_mapping)?; } @@ -692,7 +692,7 @@ impl<'de> serde::Deserialize<'de> for GetCurrencyPairMappingResponse { type Value = GetCurrencyPairMappingResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.GetCurrencyPairMappingResponse") + formatter.write_str("struct connect.oracle.v2.GetCurrencyPairMappingResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -718,7 +718,7 @@ impl<'de> serde::Deserialize<'de> for GetCurrencyPairMappingResponse { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.GetCurrencyPairMappingResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.GetCurrencyPairMappingResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetPriceRequest { @@ -732,7 +732,7 @@ impl serde::Serialize for GetPriceRequest { if !self.currency_pair.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetPriceRequest", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetPriceRequest", len)?; if !self.currency_pair.is_empty() { struct_ser.serialize_field("currencyPair", &self.currency_pair)?; } @@ -787,7 +787,7 @@ impl<'de> serde::Deserialize<'de> for GetPriceRequest { type Value = GetPriceRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.GetPriceRequest") + formatter.write_str("struct connect.oracle.v2.GetPriceRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -810,7 +810,7 @@ impl<'de> serde::Deserialize<'de> for GetPriceRequest { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.GetPriceRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.GetPriceRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetPriceResponse { @@ -833,7 +833,7 @@ impl serde::Serialize for GetPriceResponse { if self.id != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetPriceResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetPriceResponse", len)?; if let Some(v) = self.price.as_ref() { struct_ser.serialize_field("price", v)?; } @@ -908,7 +908,7 @@ impl<'de> serde::Deserialize<'de> for GetPriceResponse { type Value = GetPriceResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.GetPriceResponse") + formatter.write_str("struct connect.oracle.v2.GetPriceResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -961,7 +961,7 @@ impl<'de> serde::Deserialize<'de> for GetPriceResponse { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.GetPriceResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.GetPriceResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetPricesRequest { @@ -975,7 +975,7 @@ impl serde::Serialize for GetPricesRequest { if !self.currency_pair_ids.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetPricesRequest", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetPricesRequest", len)?; if !self.currency_pair_ids.is_empty() { struct_ser.serialize_field("currencyPairIds", &self.currency_pair_ids)?; } @@ -1030,7 +1030,7 @@ impl<'de> serde::Deserialize<'de> for GetPricesRequest { type Value = GetPricesRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.GetPricesRequest") + formatter.write_str("struct connect.oracle.v2.GetPricesRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1053,7 +1053,7 @@ impl<'de> serde::Deserialize<'de> for GetPricesRequest { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.GetPricesRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.GetPricesRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for GetPricesResponse { @@ -1067,7 +1067,7 @@ impl serde::Serialize for GetPricesResponse { if !self.prices.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.GetPricesResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.GetPricesResponse", len)?; if !self.prices.is_empty() { struct_ser.serialize_field("prices", &self.prices)?; } @@ -1121,7 +1121,7 @@ impl<'de> serde::Deserialize<'de> for GetPricesResponse { type Value = GetPricesResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.GetPricesResponse") + formatter.write_str("struct connect.oracle.v2.GetPricesResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1144,7 +1144,7 @@ impl<'de> serde::Deserialize<'de> for GetPricesResponse { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.GetPricesResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.GetPricesResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QuotePrice { @@ -1164,7 +1164,7 @@ impl serde::Serialize for QuotePrice { if self.block_height != 0 { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.oracle.v2.QuotePrice", len)?; + let mut struct_ser = serializer.serialize_struct("connect.oracle.v2.QuotePrice", len)?; if !self.price.is_empty() { struct_ser.serialize_field("price", &self.price)?; } @@ -1233,7 +1233,7 @@ impl<'de> serde::Deserialize<'de> for QuotePrice { type Value = QuotePrice; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.oracle.v2.QuotePrice") + formatter.write_str("struct connect.oracle.v2.QuotePrice") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -1274,6 +1274,6 @@ impl<'de> serde::Deserialize<'de> for QuotePrice { }) } } - deserializer.deserialize_struct("price_feed.oracle.v2.QuotePrice", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.oracle.v2.QuotePrice", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/price_feed.service.v2.rs b/crates/astria-core/src/generated/connect.service.v2.rs similarity index 93% rename from crates/astria-core/src/generated/price_feed.service.v2.rs rename to crates/astria-core/src/generated/connect.service.v2.rs index fa4827dcae..fadf917481 100644 --- a/crates/astria-core/src/generated/price_feed.service.v2.rs +++ b/crates/astria-core/src/generated/connect.service.v2.rs @@ -4,9 +4,9 @@ pub struct QueryPricesRequest {} impl ::prost::Name for QueryPricesRequest { const NAME: &'static str = "QueryPricesRequest"; - const PACKAGE: &'static str = "price_feed.service.v2"; + const PACKAGE: &'static str = "connect.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) } } /// QueryPricesResponse defines the response type for the Prices method. @@ -28,9 +28,9 @@ pub struct QueryPricesResponse { } impl ::prost::Name for QueryPricesResponse { const NAME: &'static str = "QueryPricesResponse"; - const PACKAGE: &'static str = "price_feed.service.v2"; + const PACKAGE: &'static str = "connect.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) } } /// QueryMarketMapRequest defines the request type for the MarketMap method. @@ -39,9 +39,9 @@ impl ::prost::Name for QueryPricesResponse { pub struct QueryMarketMapRequest {} impl ::prost::Name for QueryMarketMapRequest { const NAME: &'static str = "QueryMarketMapRequest"; - const PACKAGE: &'static str = "price_feed.service.v2"; + const PACKAGE: &'static str = "connect.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) } } /// QueryMarketMapResponse defines the response type for the MarketMap method. @@ -54,9 +54,9 @@ pub struct QueryMarketMapResponse { } impl ::prost::Name for QueryMarketMapResponse { const NAME: &'static str = "QueryMarketMapResponse"; - const PACKAGE: &'static str = "price_feed.service.v2"; + const PACKAGE: &'static str = "connect.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) } } /// QueryVersionRequest defines the request type for the Version method. @@ -65,9 +65,9 @@ impl ::prost::Name for QueryMarketMapResponse { pub struct QueryVersionRequest {} impl ::prost::Name for QueryVersionRequest { const NAME: &'static str = "QueryVersionRequest"; - const PACKAGE: &'static str = "price_feed.service.v2"; + const PACKAGE: &'static str = "connect.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) } } /// QueryVersionResponse defines the response type for the Version method. @@ -80,9 +80,9 @@ pub struct QueryVersionResponse { } impl ::prost::Name for QueryVersionResponse { const NAME: &'static str = "QueryVersionResponse"; - const PACKAGE: &'static str = "price_feed.service.v2"; + const PACKAGE: &'static str = "connect.service.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.service.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.service.v2.{}", Self::NAME) } } /// Generated client implementations. @@ -191,11 +191,11 @@ pub mod oracle_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.service.v2.Oracle/Prices", + "/connect.service.v2.Oracle/Prices", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("price_feed.service.v2.Oracle", "Prices")); + .insert(GrpcMethod::new("connect.service.v2.Oracle", "Prices")); self.inner.unary(req, path, codec).await } /// MarketMap defines a method for fetching the latest market map @@ -218,11 +218,11 @@ pub mod oracle_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.service.v2.Oracle/MarketMap", + "/connect.service.v2.Oracle/MarketMap", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("price_feed.service.v2.Oracle", "MarketMap")); + .insert(GrpcMethod::new("connect.service.v2.Oracle", "MarketMap")); self.inner.unary(req, path, codec).await } /// Version defines a method for fetching the current version of the oracle @@ -245,11 +245,11 @@ pub mod oracle_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/price_feed.service.v2.Oracle/Version", + "/connect.service.v2.Oracle/Version", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("price_feed.service.v2.Oracle", "Version")); + .insert(GrpcMethod::new("connect.service.v2.Oracle", "Version")); self.inner.unary(req, path, codec).await } } @@ -369,7 +369,7 @@ pub mod oracle_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/price_feed.service.v2.Oracle/Prices" => { + "/connect.service.v2.Oracle/Prices" => { #[allow(non_camel_case_types)] struct PricesSvc(pub Arc); impl< @@ -415,7 +415,7 @@ pub mod oracle_server { }; Box::pin(fut) } - "/price_feed.service.v2.Oracle/MarketMap" => { + "/connect.service.v2.Oracle/MarketMap" => { #[allow(non_camel_case_types)] struct MarketMapSvc(pub Arc); impl< @@ -461,7 +461,7 @@ pub mod oracle_server { }; Box::pin(fut) } - "/price_feed.service.v2.Oracle/Version" => { + "/connect.service.v2.Oracle/Version" => { #[allow(non_camel_case_types)] struct VersionSvc(pub Arc); impl< @@ -545,6 +545,6 @@ pub mod oracle_server { } } impl tonic::server::NamedService for OracleServer { - const NAME: &'static str = "price_feed.service.v2.Oracle"; + const NAME: &'static str = "connect.service.v2.Oracle"; } } diff --git a/crates/astria-core/src/generated/price_feed.service.v2.serde.rs b/crates/astria-core/src/generated/connect.service.v2.serde.rs similarity index 90% rename from crates/astria-core/src/generated/price_feed.service.v2.serde.rs rename to crates/astria-core/src/generated/connect.service.v2.serde.rs index 6fad5c47e7..a67adb978d 100644 --- a/crates/astria-core/src/generated/price_feed.service.v2.serde.rs +++ b/crates/astria-core/src/generated/connect.service.v2.serde.rs @@ -6,7 +6,7 @@ impl serde::Serialize for QueryMarketMapRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryMarketMapRequest", len)?; + let struct_ser = serializer.serialize_struct("connect.service.v2.QueryMarketMapRequest", len)?; struct_ser.end() } } @@ -52,7 +52,7 @@ impl<'de> serde::Deserialize<'de> for QueryMarketMapRequest { type Value = QueryMarketMapRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.service.v2.QueryMarketMapRequest") + formatter.write_str("struct connect.service.v2.QueryMarketMapRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -66,7 +66,7 @@ impl<'de> serde::Deserialize<'de> for QueryMarketMapRequest { }) } } - deserializer.deserialize_struct("price_feed.service.v2.QueryMarketMapRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.service.v2.QueryMarketMapRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryMarketMapResponse { @@ -80,7 +80,7 @@ impl serde::Serialize for QueryMarketMapResponse { if self.market_map.is_some() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryMarketMapResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.service.v2.QueryMarketMapResponse", len)?; if let Some(v) = self.market_map.as_ref() { struct_ser.serialize_field("marketMap", v)?; } @@ -135,7 +135,7 @@ impl<'de> serde::Deserialize<'de> for QueryMarketMapResponse { type Value = QueryMarketMapResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.service.v2.QueryMarketMapResponse") + formatter.write_str("struct connect.service.v2.QueryMarketMapResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -158,7 +158,7 @@ impl<'de> serde::Deserialize<'de> for QueryMarketMapResponse { }) } } - deserializer.deserialize_struct("price_feed.service.v2.QueryMarketMapResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.service.v2.QueryMarketMapResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryPricesRequest { @@ -169,7 +169,7 @@ impl serde::Serialize for QueryPricesRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryPricesRequest", len)?; + let struct_ser = serializer.serialize_struct("connect.service.v2.QueryPricesRequest", len)?; struct_ser.end() } } @@ -215,7 +215,7 @@ impl<'de> serde::Deserialize<'de> for QueryPricesRequest { type Value = QueryPricesRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.service.v2.QueryPricesRequest") + formatter.write_str("struct connect.service.v2.QueryPricesRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -229,7 +229,7 @@ impl<'de> serde::Deserialize<'de> for QueryPricesRequest { }) } } - deserializer.deserialize_struct("price_feed.service.v2.QueryPricesRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.service.v2.QueryPricesRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryPricesResponse { @@ -249,7 +249,7 @@ impl serde::Serialize for QueryPricesResponse { if !self.version.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryPricesResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.service.v2.QueryPricesResponse", len)?; if !self.prices.is_empty() { struct_ser.serialize_field("prices", &self.prices)?; } @@ -315,7 +315,7 @@ impl<'de> serde::Deserialize<'de> for QueryPricesResponse { type Value = QueryPricesResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.service.v2.QueryPricesResponse") + formatter.write_str("struct connect.service.v2.QueryPricesResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -356,7 +356,7 @@ impl<'de> serde::Deserialize<'de> for QueryPricesResponse { }) } } - deserializer.deserialize_struct("price_feed.service.v2.QueryPricesResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.service.v2.QueryPricesResponse", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryVersionRequest { @@ -367,7 +367,7 @@ impl serde::Serialize for QueryVersionRequest { { use serde::ser::SerializeStruct; let len = 0; - let struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryVersionRequest", len)?; + let struct_ser = serializer.serialize_struct("connect.service.v2.QueryVersionRequest", len)?; struct_ser.end() } } @@ -413,7 +413,7 @@ impl<'de> serde::Deserialize<'de> for QueryVersionRequest { type Value = QueryVersionRequest; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.service.v2.QueryVersionRequest") + formatter.write_str("struct connect.service.v2.QueryVersionRequest") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -427,7 +427,7 @@ impl<'de> serde::Deserialize<'de> for QueryVersionRequest { }) } } - deserializer.deserialize_struct("price_feed.service.v2.QueryVersionRequest", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.service.v2.QueryVersionRequest", FIELDS, GeneratedVisitor) } } impl serde::Serialize for QueryVersionResponse { @@ -441,7 +441,7 @@ impl serde::Serialize for QueryVersionResponse { if !self.version.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.service.v2.QueryVersionResponse", len)?; + let mut struct_ser = serializer.serialize_struct("connect.service.v2.QueryVersionResponse", len)?; if !self.version.is_empty() { struct_ser.serialize_field("version", &self.version)?; } @@ -495,7 +495,7 @@ impl<'de> serde::Deserialize<'de> for QueryVersionResponse { type Value = QueryVersionResponse; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.service.v2.QueryVersionResponse") + formatter.write_str("struct connect.service.v2.QueryVersionResponse") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -518,6 +518,6 @@ impl<'de> serde::Deserialize<'de> for QueryVersionResponse { }) } } - deserializer.deserialize_struct("price_feed.service.v2.QueryVersionResponse", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.service.v2.QueryVersionResponse", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/price_feed.types.v2.rs b/crates/astria-core/src/generated/connect.types.v2.rs similarity index 81% rename from crates/astria-core/src/generated/price_feed.types.v2.rs rename to crates/astria-core/src/generated/connect.types.v2.rs index 6d9b75e303..4ee9cb5851 100644 --- a/crates/astria-core/src/generated/price_feed.types.v2.rs +++ b/crates/astria-core/src/generated/connect.types.v2.rs @@ -10,8 +10,8 @@ pub struct CurrencyPair { } impl ::prost::Name for CurrencyPair { const NAME: &'static str = "CurrencyPair"; - const PACKAGE: &'static str = "price_feed.types.v2"; + const PACKAGE: &'static str = "connect.types.v2"; fn full_name() -> ::prost::alloc::string::String { - ::prost::alloc::format!("price_feed.types.v2.{}", Self::NAME) + ::prost::alloc::format!("connect.types.v2.{}", Self::NAME) } } diff --git a/crates/astria-core/src/generated/price_feed.types.v2.serde.rs b/crates/astria-core/src/generated/connect.types.v2.serde.rs similarity index 93% rename from crates/astria-core/src/generated/price_feed.types.v2.serde.rs rename to crates/astria-core/src/generated/connect.types.v2.serde.rs index e5fb8a5161..695fdcca9e 100644 --- a/crates/astria-core/src/generated/price_feed.types.v2.serde.rs +++ b/crates/astria-core/src/generated/connect.types.v2.serde.rs @@ -12,7 +12,7 @@ impl serde::Serialize for CurrencyPair { if !self.quote.is_empty() { len += 1; } - let mut struct_ser = serializer.serialize_struct("price_feed.types.v2.CurrencyPair", len)?; + let mut struct_ser = serializer.serialize_struct("connect.types.v2.CurrencyPair", len)?; if !self.base.is_empty() { struct_ser.serialize_field("Base", &self.base)?; } @@ -72,7 +72,7 @@ impl<'de> serde::Deserialize<'de> for CurrencyPair { type Value = CurrencyPair; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct price_feed.types.v2.CurrencyPair") + formatter.write_str("struct connect.types.v2.CurrencyPair") } fn visit_map(self, mut map_: V) -> std::result::Result @@ -103,6 +103,6 @@ impl<'de> serde::Deserialize<'de> for CurrencyPair { }) } } - deserializer.deserialize_struct("price_feed.types.v2.CurrencyPair", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("connect.types.v2.CurrencyPair", FIELDS, GeneratedVisitor) } } diff --git a/crates/astria-core/src/generated/mod.rs b/crates/astria-core/src/generated/mod.rs index 7b5f41d238..a49d6b5c2e 100644 --- a/crates/astria-core/src/generated/mod.rs +++ b/crates/astria-core/src/generated/mod.rs @@ -224,64 +224,66 @@ pub mod celestia { } } +use price_feed as connect; + #[path = ""] pub mod price_feed { pub mod abci { pub mod v2 { - include!("price_feed.abci.v2.rs"); + include!("connect.abci.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("price_feed.abci.v2.serde.rs"); + include!("connect.abci.v2.serde.rs"); } } } pub mod marketmap { pub mod v2 { - include!("price_feed.marketmap.v2.rs"); + include!("connect.marketmap.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("price_feed.marketmap.v2.serde.rs"); + include!("connect.marketmap.v2.serde.rs"); } } } pub mod oracle { pub mod v2 { - include!("price_feed.oracle.v2.rs"); + include!("connect.oracle.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("price_feed.oracle.v2.serde.rs"); + include!("connect.oracle.v2.serde.rs"); } } } pub mod service { pub mod v2 { - include!("price_feed.service.v2.rs"); + include!("connect.service.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("price_feed.service.v2.serde.rs"); + include!("connect.service.v2.serde.rs"); } } } pub mod types { pub mod v2 { - include!("price_feed.types.v2.rs"); + include!("connect.types.v2.rs"); #[cfg(feature = "serde")] mod _serde_impl { use super::*; - include!("price_feed.types.v2.serde.rs"); + include!("connect.types.v2.serde.rs"); } } } diff --git a/proto/protocolapis/astria/protocol/genesis/v1/types.proto b/proto/protocolapis/astria/protocol/genesis/v1/types.proto index 3d5b798a7c..3084699e4f 100644 --- a/proto/protocolapis/astria/protocol/genesis/v1/types.proto +++ b/proto/protocolapis/astria/protocol/genesis/v1/types.proto @@ -4,8 +4,8 @@ package astria.protocol.genesis.v1; import "astria/primitive/v1/types.proto"; import "astria/protocol/fees/v1/types.proto"; -import "price_feed/marketmap/v2/genesis.proto"; -import "price_feed/oracle/v2/genesis.proto"; +import "connect/marketmap/v2/genesis.proto"; +import "connect/oracle/v2/genesis.proto"; message GenesisAppState { string chain_id = 1; @@ -63,6 +63,6 @@ message GenesisFees { } message PriceFeedGenesis { - price_feed.marketmap.v2.GenesisState market_map = 1; - price_feed.oracle.v2.GenesisState oracle = 2; + connect.marketmap.v2.GenesisState market_map = 1; + connect.oracle.v2.GenesisState oracle = 2; } diff --git a/proto/protocolapis/astria/protocol/price_feed/v1/transaction.proto b/proto/protocolapis/astria/protocol/price_feed/v1/transaction.proto index cf622a0806..5a5aa607a8 100644 --- a/proto/protocolapis/astria/protocol/price_feed/v1/transaction.proto +++ b/proto/protocolapis/astria/protocol/price_feed/v1/transaction.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package astria.protocol.price_feed.v1; import "astria_vendored/tendermint/abci/types.proto"; -import "price_feed/types/v2/currency_pair.proto"; +import "connect/types/v2/currency_pair.proto"; message ExtendedCommitInfoWithCurrencyPairMapping { astria_vendored.tendermint.abci.ExtendedCommitInfo extended_commit_info = 1; @@ -12,6 +12,6 @@ message ExtendedCommitInfoWithCurrencyPairMapping { message IdWithCurrencyPair { uint64 id = 1; - .price_feed.types.v2.CurrencyPair currency_pair = 2; + connect.types.v2.CurrencyPair currency_pair = 2; uint64 decimals = 3; } diff --git a/proto/protocolapis/astria/protocol/transaction/v1/action.proto b/proto/protocolapis/astria/protocol/transaction/v1/action.proto index fceb905922..054bcfde9e 100644 --- a/proto/protocolapis/astria/protocol/transaction/v1/action.proto +++ b/proto/protocolapis/astria/protocol/transaction/v1/action.proto @@ -6,9 +6,9 @@ import "astria/primitive/v1/types.proto"; import "astria/protocol/fees/v1/types.proto"; import "astria_vendored/penumbra/core/component/ibc/v1/ibc.proto"; import "astria_vendored/tendermint/abci/types.proto"; -import "price_feed/marketmap/v2/market.proto"; -import "price_feed/marketmap/v2/params.proto"; -import "price_feed/types/v2/currency_pair.proto"; +import "connect/marketmap/v2/market.proto"; +import "connect/marketmap/v2/params.proto"; +import "connect/types/v2/currency_pair.proto"; message Action { oneof value { @@ -259,7 +259,7 @@ message CurrencyPairsChange { } message CurrencyPairs { - repeated price_feed.types.v2.CurrencyPair pairs = 1; + repeated connect.types.v2.CurrencyPair pairs = 1; } message MarketMapChange { @@ -280,11 +280,11 @@ message ChangeMarkets { // A list of markets for creation, updating, or removal. message Markets { - repeated price_feed.marketmap.v2.Market markets = 1; + repeated connect.marketmap.v2.Market markets = 1; } // Updates the market map parameters. message UpdateMarketMapParams { // Params defines the new parameters for the x/marketmap module. - price_feed.marketmap.v2.Params params = 1; + connect.marketmap.v2.Params params = 1; } diff --git a/proto/sequencerblockapis/astria/sequencerblock/v1/block.proto b/proto/sequencerblockapis/astria/sequencerblock/v1/block.proto index 9ccbbd493b..21abbfc22d 100644 --- a/proto/sequencerblockapis/astria/sequencerblock/v1/block.proto +++ b/proto/sequencerblockapis/astria/sequencerblock/v1/block.proto @@ -3,8 +3,8 @@ syntax = "proto3"; package astria.sequencerblock.v1; import "astria/primitive/v1/types.proto"; +import "connect/types/v2/currency_pair.proto"; import "google/protobuf/timestamp.proto"; -import "price_feed/types/v2/currency_pair.proto"; // `RollupTransactions` are a sequence of opaque bytes together with a 32 byte // identifier of that rollup. @@ -180,7 +180,7 @@ message PriceFeedData { } message Price { - price_feed.types.v2.CurrencyPair currency_pair = 1; + connect.types.v2.CurrencyPair currency_pair = 1; astria.primitive.v1.Uint128 price = 2; uint64 decimals = 3; } diff --git a/proto/vendored/price_feed/abci/v2/vote_extensions.proto b/proto/vendored/connect/abci/v2/vote_extensions.proto similarity index 94% rename from proto/vendored/price_feed/abci/v2/vote_extensions.proto rename to proto/vendored/connect/abci/v2/vote_extensions.proto index ddbb02b089..5fcdcf7f2b 100644 --- a/proto/vendored/price_feed/abci/v2/vote_extensions.proto +++ b/proto/vendored/connect/abci/v2/vote_extensions.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package price_feed.abci.v2; +package connect.abci.v2; option go_package = "github.com/skip-mev/connect/v2/abci/ve/types"; diff --git a/proto/vendored/price_feed/marketmap/v2/genesis.proto b/proto/vendored/connect/marketmap/v2/genesis.proto similarity index 82% rename from proto/vendored/price_feed/marketmap/v2/genesis.proto rename to proto/vendored/connect/marketmap/v2/genesis.proto index e78c508d68..3ce6bff2a0 100644 --- a/proto/vendored/price_feed/marketmap/v2/genesis.proto +++ b/proto/vendored/connect/marketmap/v2/genesis.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package price_feed.marketmap.v2; +package connect.marketmap.v2; -import "price_feed/marketmap/v2/market.proto"; -import "price_feed/marketmap/v2/params.proto"; +import "connect/marketmap/v2/market.proto"; +import "connect/marketmap/v2/params.proto"; option go_package = "github.com/skip-mev/connect/v2/x/marketmap/types"; diff --git a/proto/vendored/price_feed/marketmap/v2/market.proto b/proto/vendored/connect/marketmap/v2/market.proto similarity index 92% rename from proto/vendored/price_feed/marketmap/v2/market.proto rename to proto/vendored/connect/marketmap/v2/market.proto index d7f7887661..0ceda1e520 100644 --- a/proto/vendored/price_feed/marketmap/v2/market.proto +++ b/proto/vendored/connect/marketmap/v2/market.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package price_feed.marketmap.v2; +package connect.marketmap.v2; -import "price_feed/types/v2/currency_pair.proto"; +import "connect/types/v2/currency_pair.proto"; option go_package = "github.com/skip-mev/connect/v2/x/marketmap/types"; @@ -21,7 +21,7 @@ message Market { // providers required to consider the ticker valid. message Ticker { // CurrencyPair is the currency pair for this ticker. - price_feed.types.v2.CurrencyPair currency_pair = 1; + connect.types.v2.CurrencyPair currency_pair = 1; // Decimals is the number of decimal places for the ticker. The number of // decimal places is used to convert the price to a human-readable format. @@ -54,7 +54,7 @@ message ProviderConfig { // For example, if the desired Ticker is BTC/USD, this market could be reached // using: OffChainTicker = BTC/USDT NormalizeByPair = USDT/USD This field is // optional and nullable. - price_feed.types.v2.CurrencyPair normalize_by_pair = 3; + connect.types.v2.CurrencyPair normalize_by_pair = 3; // Invert is a boolean indicating if the BASE and QUOTE of the market should // be inverted. i.e. BASE -> QUOTE, QUOTE -> BASE diff --git a/proto/vendored/price_feed/marketmap/v2/params.proto b/proto/vendored/connect/marketmap/v2/params.proto similarity index 93% rename from proto/vendored/price_feed/marketmap/v2/params.proto rename to proto/vendored/connect/marketmap/v2/params.proto index 8d7bccfb4c..b880804f07 100644 --- a/proto/vendored/price_feed/marketmap/v2/params.proto +++ b/proto/vendored/connect/marketmap/v2/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package price_feed.marketmap.v2; +package connect.marketmap.v2; option go_package = "github.com/skip-mev/connect/v2/x/marketmap/types"; diff --git a/proto/vendored/price_feed/marketmap/v2/query.proto b/proto/vendored/connect/marketmap/v2/query.proto similarity index 81% rename from proto/vendored/price_feed/marketmap/v2/query.proto rename to proto/vendored/connect/marketmap/v2/query.proto index 3a5131af1c..765dbf29d0 100644 --- a/proto/vendored/price_feed/marketmap/v2/query.proto +++ b/proto/vendored/connect/marketmap/v2/query.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package price_feed.marketmap.v2; +package connect.marketmap.v2; +import "connect/marketmap/v2/market.proto"; +import "connect/marketmap/v2/params.proto"; +import "connect/types/v2/currency_pair.proto"; import "google/api/annotations.proto"; -import "price_feed/marketmap/v2/market.proto"; -import "price_feed/marketmap/v2/params.proto"; -import "price_feed/types/v2/currency_pair.proto"; option go_package = "github.com/skip-mev/connect/v2/x/marketmap/types"; @@ -13,23 +13,23 @@ service Query { // MarketMap returns the full market map stored in the x/marketmap // module. rpc MarketMap(MarketMapRequest) returns (MarketMapResponse) { - option (google.api.http) = {get: "/price_feed/marketmap/v2/marketmap"}; + option (google.api.http) = {get: "/connect/marketmap/v2/marketmap"}; } // Market returns a market stored in the x/marketmap // module. rpc Market(MarketRequest) returns (MarketResponse) { - option (google.api.http) = {get: "/price_feed/marketmap/v2/market"}; + option (google.api.http) = {get: "/connect/marketmap/v2/market"}; } // LastUpdated returns the last height the market map was updated at. rpc LastUpdated(LastUpdatedRequest) returns (LastUpdatedResponse) { - option (google.api.http) = {get: "/price_feed/marketmap/v2/last_updated"}; + option (google.api.http) = {get: "/connect/marketmap/v2/last_updated"}; } // Params returns the current x/marketmap module parameters. rpc Params(ParamsRequest) returns (ParamsResponse) { - option (google.api.http) = {get: "/price_feed/marketmap/v2/params"}; + option (google.api.http) = {get: "/connect/marketmap/v2/params"}; } } @@ -57,7 +57,7 @@ message MarketMapResponse { message MarketRequest { // CurrencyPair is the currency pair associated with the market being // requested. - price_feed.types.v2.CurrencyPair currency_pair = 1; + connect.types.v2.CurrencyPair currency_pair = 1; } // MarketResponse is the query response for the Market query. diff --git a/proto/vendored/price_feed/oracle/v2/genesis.proto b/proto/vendored/connect/oracle/v2/genesis.proto similarity index 94% rename from proto/vendored/price_feed/oracle/v2/genesis.proto rename to proto/vendored/connect/oracle/v2/genesis.proto index 6376719ff9..fa371fa6e1 100644 --- a/proto/vendored/price_feed/oracle/v2/genesis.proto +++ b/proto/vendored/connect/oracle/v2/genesis.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package price_feed.oracle.v2; +package connect.oracle.v2; +import "connect/types/v2/currency_pair.proto"; import "google/protobuf/timestamp.proto"; -import "price_feed/types/v2/currency_pair.proto"; option go_package = "github.com/skip-mev/connect/v2/x/oracle/types"; @@ -38,7 +38,7 @@ message CurrencyPairState { // CurrencyPair. message CurrencyPairGenesis { // The CurrencyPair to be added to module state - price_feed.types.v2.CurrencyPair currency_pair = 1; + connect.types.v2.CurrencyPair currency_pair = 1; // A genesis price if one exists (note this will be empty, unless it results // from forking the state of this module) QuotePrice currency_pair_price = 2; diff --git a/proto/vendored/price_feed/oracle/v2/query.proto b/proto/vendored/connect/oracle/v2/query.proto similarity index 83% rename from proto/vendored/price_feed/oracle/v2/query.proto rename to proto/vendored/connect/oracle/v2/query.proto index e143cf49d3..fbdd3e0e55 100644 --- a/proto/vendored/price_feed/oracle/v2/query.proto +++ b/proto/vendored/connect/oracle/v2/query.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package price_feed.oracle.v2; +package connect.oracle.v2; +import "connect/oracle/v2/genesis.proto"; +import "connect/types/v2/currency_pair.proto"; import "google/api/annotations.proto"; -import "price_feed/oracle/v2/genesis.proto"; -import "price_feed/types/v2/currency_pair.proto"; option go_package = "github.com/skip-mev/connect/v2/x/oracle/types"; @@ -11,17 +11,17 @@ option go_package = "github.com/skip-mev/connect/v2/x/oracle/types"; service Query { // Get all the currency pairs the x/oracle module is tracking price-data for. rpc GetAllCurrencyPairs(GetAllCurrencyPairsRequest) returns (GetAllCurrencyPairsResponse) { - option (google.api.http) = {get: "/price_feed/oracle/v2/get_all_tickers"}; + option (google.api.http) = {get: "/connect/oracle/v2/get_all_tickers"}; } // Given a CurrencyPair (or its identifier) return the latest QuotePrice for // that CurrencyPair. rpc GetPrice(GetPriceRequest) returns (GetPriceResponse) { - option (google.api.http) = {get: "/price_feed/oracle/v2/get_price"}; + option (google.api.http) = {get: "/connect/oracle/v2/get_price"}; } rpc GetPrices(GetPricesRequest) returns (GetPricesResponse) { - option (google.api.http) = {get: "/price_feed/oracle/v2/get_prices"}; + option (google.api.http) = {get: "/connect/oracle/v2/get_prices"}; } // Get the mapping of currency pair ID -> currency pair. This is useful for @@ -29,7 +29,7 @@ service Query { // the underlying currency pair from it. rpc GetCurrencyPairMapping(GetCurrencyPairMappingRequest) returns (GetCurrencyPairMappingResponse) { option (google.api.http) = { - get: "/price_feed/oracle/v2/get_currency_pair_mapping" + get: "/connect/oracle/v2/get_currency_pair_mapping" additional_bindings: [] }; } @@ -40,7 +40,7 @@ message GetAllCurrencyPairsRequest {} // GetAllCurrencyPairsResponse returns all CurrencyPairs that the module is // currently tracking. message GetAllCurrencyPairsResponse { - repeated price_feed.types.v2.CurrencyPair currency_pairs = 1; + repeated connect.types.v2.CurrencyPair currency_pairs = 1; } // GetPriceRequest takes an identifier for the @@ -84,5 +84,5 @@ message GetCurrencyPairMappingRequest {} message GetCurrencyPairMappingResponse { // currency_pair_mapping is a mapping of the id representing the currency pair // to the currency pair itself. - map currency_pair_mapping = 1; + map currency_pair_mapping = 1; } diff --git a/proto/vendored/price_feed/service/v2/oracle.proto b/proto/vendored/connect/service/v2/oracle.proto similarity index 83% rename from proto/vendored/price_feed/service/v2/oracle.proto rename to proto/vendored/connect/service/v2/oracle.proto index 22334c9488..1beb98f429 100644 --- a/proto/vendored/price_feed/service/v2/oracle.proto +++ b/proto/vendored/connect/service/v2/oracle.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package price_feed.service.v2; +package connect.service.v2; +import "connect/marketmap/v2/market.proto"; import "google/api/annotations.proto"; import "google/protobuf/timestamp.proto"; -import "price_feed/marketmap/v2/market.proto"; option go_package = "github.com/skip-mev/connect/v2/service/servers/oracle/types"; @@ -11,19 +11,19 @@ option go_package = "github.com/skip-mev/connect/v2/service/servers/oracle/types service Oracle { // Prices defines a method for fetching the latest prices. rpc Prices(QueryPricesRequest) returns (QueryPricesResponse) { - option (google.api.http) = {get: "/price_feed/oracle/v2/prices"}; + option (google.api.http) = {get: "/connect/oracle/v2/prices"}; } // MarketMap defines a method for fetching the latest market map // configuration. rpc MarketMap(QueryMarketMapRequest) returns (QueryMarketMapResponse) { - option (google.api.http) = {get: "/price_feed/oracle/v2/marketmap"}; + option (google.api.http) = {get: "/connect/oracle/v2/marketmap"}; } // Version defines a method for fetching the current version of the oracle // service. rpc Version(QueryVersionRequest) returns (QueryVersionResponse) { - option (google.api.http) = {get: "/price_feed/oracle/v2/version"}; + option (google.api.http) = {get: "/connect/oracle/v2/version"}; } } @@ -48,7 +48,7 @@ message QueryMarketMapRequest {} // QueryMarketMapResponse defines the response type for the MarketMap method. message QueryMarketMapResponse { // MarketMap defines the current market map configuration. - price_feed.marketmap.v2.MarketMap market_map = 1; + connect.marketmap.v2.MarketMap market_map = 1; } // QueryVersionRequest defines the request type for the Version method. diff --git a/proto/vendored/price_feed/types/v2/currency_pair.proto b/proto/vendored/connect/types/v2/currency_pair.proto similarity index 90% rename from proto/vendored/price_feed/types/v2/currency_pair.proto rename to proto/vendored/connect/types/v2/currency_pair.proto index 11efe133f6..67c2e86d12 100644 --- a/proto/vendored/price_feed/types/v2/currency_pair.proto +++ b/proto/vendored/connect/types/v2/currency_pair.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package price_feed.types.v2; +package connect.types.v2; option go_package = "github.com/skip-mev/connect/v2/pkg/types"; diff --git a/tools/protobuf-compiler/src/main.rs b/tools/protobuf-compiler/src/main.rs index 41c99d3e89..93c68ef717 100644 --- a/tools/protobuf-compiler/src/main.rs +++ b/tools/protobuf-compiler/src/main.rs @@ -70,13 +70,13 @@ fn main() { .build_client(true) .build_server(true) .emit_rerun_if_changed(false) - .btree_map([".price_feed"]) + .btree_map([".connect"]) .bytes([ ".astria", ".astria_vendored.tendermint.abci", ".celestia", + ".connect", ".cosmos", - ".price_feed", ".tendermint", ]) .client_mod_attribute(".", "#[cfg(feature=\"client\")]") @@ -103,14 +103,14 @@ fn main() { pbjson_build::Builder::new() .register_descriptors(&descriptor_set) .unwrap() - .btree_map([".price_feed"]) + .btree_map([".connect"]) .out_dir(&out_dir) .build(&[ ".astria", ".astria_vendored", ".celestia", + ".connect", ".cosmos", - ".price_feed", ".tendermint", ]) .unwrap(); @@ -149,8 +149,8 @@ fn clean_non_astria_code(generated: &mut ContentMap) { !name.starts_with("astria.") && !name.starts_with("astria_vendored.") && !name.starts_with("celestia.") + && !name.starts_with("connect.") && !name.starts_with("cosmos.") - && !name.starts_with("price_feed.") && !name.starts_with("tendermint.") }) .cloned()