Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ incremental = false

[workspace.dependencies]
# reth
gravity-api-types = { package = "api-types", git = "https://github.com/Galxe/gravity-aptos", rev = "b1f68dc85781ef0d28a568d9d64604b153be9d9e" }
gravity-api-types = { package = "api-types", git = "https://github.com/Galxe/gravity-aptos", rev = "d163fa649970c7c8446dbc41a367c2d0b960cca6" }
reth = { path = "bin/reth" }
reth-storage-rpc-provider = { path = "crates/storage/rpc-provider" }
reth-basic-payload-builder = { path = "crates/payload/basic" }
Expand All @@ -376,7 +376,7 @@ reth-cli = { path = "crates/cli/cli" }
reth-cli-commands = { path = "crates/cli/commands" }
reth-cli-runner = { path = "crates/cli/runner" }
reth-cli-util = { path = "crates/cli/util" }
reth-codecs = { version = "0.4.1", default-features = false }
reth-codecs = { version = "=0.4.1", default-features = false }
reth-codecs-derive = "0.4.1"
reth-config = { path = "crates/config", default-features = false }
reth-consensus = { path = "crates/consensus/consensus", default-features = false }
Expand Down Expand Up @@ -463,7 +463,7 @@ reth-rpc-eth-types = { path = "crates/rpc/rpc-eth-types", default-features = fal
reth-rpc-layer = { path = "crates/rpc/rpc-layer" }
reth-rpc-server-types = { path = "crates/rpc/rpc-server-types" }
reth-rpc-convert = { path = "crates/rpc/rpc-convert" }
reth-rpc-traits = { version = "0.4.1", default-features = false }
reth-rpc-traits = { version = "=0.4.1", default-features = false }
reth-stages = { path = "crates/stages/stages" }
reth-stages-api = { path = "crates/stages/api" }
reth-stages-types = { path = "crates/stages/types", default-features = false }
Expand All @@ -489,7 +489,7 @@ gravity-primitives = { path = "crates/gravity-primitives" }
gravity-precompiles = { path = "crates/gravity-precompiles" }
reth-trie-sparse = { path = "crates/trie/sparse", default-features = false }
reth-trie-sparse-parallel = { path = "crates/trie/sparse-parallel" }
reth-zstd-compressors = { version = "0.4.1", default-features = false }
reth-zstd-compressors = { version = "=0.4.1", default-features = false }
reth-ress-protocol = { path = "crates/ress/protocol" }
reth-ress-provider = { path = "crates/ress/provider" }

Expand All @@ -514,7 +514,7 @@ alloy-eip2124 = { version = "0.2.0", default-features = false }
alloy-eip7928 = { version = "0.4.0", default-features = false, features = ["rlp"] }
alloy-evm = { version = "0.36.0", default-features = false }
alloy-rlp = { version = "0.3.13", default-features = false, features = ["core-net"] }
alloy-trie = { version = "0.9.4", default-features = false }
alloy-trie = { version = "=0.9.4", default-features = false }

alloy-hardforks = "0.4.7"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ sol! {
/// @notice Batch arrays have mismatched lengths
error OracleBatchArrayLengthMismatch(uint256 noncesLength, uint256 payloadsLength, uint256 gasLimitsLength);

// -------------------- JWKManager Errors (for reference, callback failures don't revert main tx) --------------------
// -------------------- JWKManager Errors (for reference) --------------------
/// @notice JWK version must be strictly increasing
error JWKVersionNotIncreasing(bytes issuer, uint64 currentVersion, uint64 providedVersion);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,18 @@ where
providers
}

/// Fetch and parse blockchain providers (sourceType=0)
/// Fetch and parse relayer-backed providers (sourceType=0, sourceType=6, ...)
/// Uses shared OracleTaskClient for task enumeration
fn fetch_blockchain_providers(
fn fetch_relayer_providers(
&self,
block_id: BlockId,
) -> Vec<gravity_api_types::on_chain_config::jwks::OIDCProvider> {
let task_uris = self.oracle_client().fetch_blockchain_task_uris(block_id);
let task_uris = self.oracle_client().fetch_relayer_task_uris(block_id);

task_uris
.into_iter()
.map(|(uri, nonce)| {
info!(uri = %uri, nonce = nonce, "Found blockchain monitoring task");
info!(uri = %uri, nonce = nonce, "Found relayer-backed oracle task");
gravity_api_types::on_chain_config::jwks::OIDCProvider {
name: uri.clone(),
config_url: uri,
Expand All @@ -125,8 +125,8 @@ where
// 1. Fetch JWK providers (sourceType=1)
all_providers.extend(self.fetch_jwk_providers(block_id));

// 2. Fetch blockchain providers (sourceType=0)
all_providers.extend(self.fetch_blockchain_providers(block_id));
// 2. Fetch relayer-backed providers (sourceType=0, sourceType=6, ...)
all_providers.extend(self.fetch_relayer_providers(block_id));

info!(provider_count = all_providers.len(), "Fetched oracle task providers");

Expand Down
Loading
Loading