Skip to content

fix: API keys #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gregorydemay merged 3 commits into from
Apr 7, 2025
Merged

fix: API keys #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a93460
XC-297: use API keys for drpc.org
gregorydemay Apr 7, 2025
6c95754
XC-297: put Ankr as non-default
gregorydemay Apr 7, 2025
120d8c4
XC-297: fix switched Helius URLs.
gregorydemay Apr 7, 2025
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
4 changes: 4 additions & 0 deletions canister/scripts/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ set -u # or set -o nounset
: "$ALCHEMY_MAINNET_API_KEY"
: "$ALCHEMY_DEVNET_API_KEY"
: "$ANKR_MAINNET_API_KEY"
: "$DRPC_DEVNET_API_KEY"
: "$DRPC_MAINNET_API_KEY"
: "$ANKR_DEVNET_API_KEY"
: "$HELIUS_MAINNET_API_KEY"
: "$HELIUS_DEVNET_API_KEY"
Expand All @@ -23,6 +25,8 @@ dfx canister call ${CANISTER} updateApiKeys "(vec {
record { variant { AlchemyDevnet }; opt \"${ALCHEMY_DEVNET_API_KEY}\" };
record { variant { AnkrMainnet }; opt \"${ANKR_MAINNET_API_KEY}\" };
record { variant { AnkrDevnet }; opt \"${ANKR_DEVNET_API_KEY}\" };
record { variant { DrpcMainnet }; opt \"${DRPC_MAINNET_API_KEY}\" };
record { variant { DrpcDevnet }; opt \"${DRPC_DEVNET_API_KEY}\" };
record { variant { HeliusMainnet }; opt \"${HELIUS_MAINNET_API_KEY}\" };
record { variant { HeliusDevnet }; opt \"${HELIUS_DEVNET_API_KEY}\" };
})" ${FLAGS}
Expand Down
30 changes: 18 additions & 12 deletions canister/src/providers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,27 @@ thread_local! {
},
SupportedRpcProviderId::DrpcMainnet => SupportedRpcProvider {
cluster: SolanaCluster::Mainnet,
access: RpcAccess::Unauthenticated {
public_url: "https://solana.drpc.org".to_string(),
},
access: RpcAccess::Authenticated {
auth: RpcAuth::UrlParameter {
url_pattern: "https://lb.drpc.org/ogrpc?network=solana&dkey={API_KEY}".to_string()
},
public_url: Some("https://solana.drpc.org".to_string()),
}
},
SupportedRpcProviderId::DrpcDevnet => SupportedRpcProvider {
cluster: SolanaCluster::Devnet,
access: RpcAccess::Unauthenticated {
public_url: "https://solana-devnet.drpc.org".to_string(),
},
access: RpcAccess::Authenticated {
auth: RpcAuth::UrlParameter {
url_pattern: "https://lb.drpc.org/ogrpc?network=solana-devnet&dkey={API_KEY}".to_string()
},
public_url: Some("https://solana-devnet.drpc.org".to_string()),
}
},
SupportedRpcProviderId::HeliusMainnet => SupportedRpcProvider {
cluster: SolanaCluster::Mainnet,
access: RpcAccess::Authenticated {
auth: RpcAuth::UrlParameter {
url_pattern: "https://devnet.helius-rpc.com/?api-key={API_KEY}".to_string(),
url_pattern: "https://mainnet.helius-rpc.com/?api-key={API_KEY}".to_string(),
},
public_url: None,
},
Expand All @@ -73,7 +79,7 @@ thread_local! {
cluster: SolanaCluster::Devnet,
access: RpcAccess::Authenticated {
auth: RpcAuth::UrlParameter {
url_pattern: "https://mainnet.helius-rpc.com/?api-key={API_KEY}".to_string(),
url_pattern: "https://devnet.helius-rpc.com/?api-key={API_KEY}".to_string(),
},
public_url: None,
},
Expand Down Expand Up @@ -104,21 +110,21 @@ impl Providers {
// if the providers are not explicitly specified by the caller.
const DEFAULT_MAINNET_SUPPORTED_PROVIDERS: &'static [SupportedRpcProviderId] = &[
SupportedRpcProviderId::AlchemyMainnet,
SupportedRpcProviderId::AnkrMainnet,
SupportedRpcProviderId::HeliusMainnet,
SupportedRpcProviderId::DrpcMainnet,
];
const NON_DEFAULT_MAINNET_SUPPORTED_PROVIDERS: &'static [SupportedRpcProviderId] = &[
SupportedRpcProviderId::HeliusMainnet,
SupportedRpcProviderId::AnkrMainnet,
SupportedRpcProviderId::PublicNodeMainnet,
];

const DEFAULT_DEVNET_SUPPORTED_PROVIDERS: &'static [SupportedRpcProviderId] = &[
SupportedRpcProviderId::AlchemyDevnet,
SupportedRpcProviderId::AnkrDevnet,
SupportedRpcProviderId::HeliusDevnet,
SupportedRpcProviderId::DrpcDevnet,
];
const NON_DEFAULT_DEVNET_SUPPORTED_PROVIDERS: &'static [SupportedRpcProviderId] =
&[SupportedRpcProviderId::HeliusDevnet];
&[SupportedRpcProviderId::AnkrDevnet];

pub fn new(source: RpcSources, strategy: ConsensusStrategy) -> Result<Self, ProviderError> {
fn get_sources(provider_ids: &[SupportedRpcProviderId]) -> Vec<RpcSource> {
Expand Down