From 3b034c7604e7631474ce00dad967f1633670026f Mon Sep 17 00:00:00 2001 From: Joy Wang <108701016+joyqvq@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:42:56 -0400 Subject: [PATCH] feat: enable karrier one for testnet/mainnet (#18898) --- crates/sui-config/src/node.rs | 10 +++++-- ...ests__network_config_snapshot_matches.snap | 29 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/crates/sui-config/src/node.rs b/crates/sui-config/src/node.rs index 1b608c36bc2f4..ff87d1c8cc506 100644 --- a/crates/sui-config/src/node.rs +++ b/crates/sui-config/src/node.rs @@ -228,6 +228,8 @@ fn default_jwk_fetch_interval_seconds() -> u64 { pub fn default_zklogin_oauth_providers() -> BTreeMap> { let mut map = BTreeMap::new(); + + // providers that are available on devnet only. let experimental_providers = BTreeSet::from([ "Google".to_string(), "Facebook".to_string(), @@ -239,15 +241,19 @@ pub fn default_zklogin_oauth_providers() -> BTreeMap> { "Microsoft".to_string(), "KarrierOne".to_string(), "Credenza3".to_string(), - "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A".to_string(), - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8".to_string(), + "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A".to_string(), // test tenant in mysten aws + "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8".to_string(), // ambrus, external partner ]); + + // providers that are available for mainnet and testnet. let providers = BTreeSet::from([ "Google".to_string(), "Facebook".to_string(), "Twitch".to_string(), "Apple".to_string(), "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8".to_string(), + "KarrierOne".to_string(), + "Credenza3".to_string(), ]); map.insert(Chain::Mainnet, providers.clone()); map.insert(Chain::Testnet, providers); diff --git a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap index 02d6693f87ab4..929df5b6b20b9 100644 --- a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap +++ b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap @@ -100,14 +100,18 @@ validator_configs: Mainnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Testnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Unknown: - Apple @@ -241,14 +245,18 @@ validator_configs: Mainnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Testnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Unknown: - Apple @@ -382,14 +390,18 @@ validator_configs: Mainnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Testnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Unknown: - Apple @@ -523,14 +535,18 @@ validator_configs: Mainnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Testnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Unknown: - Apple @@ -664,14 +680,18 @@ validator_configs: Mainnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Testnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Unknown: - Apple @@ -805,14 +825,18 @@ validator_configs: Mainnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Testnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Unknown: - Apple @@ -946,14 +970,18 @@ validator_configs: Mainnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Testnet: - Apple - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" + - Credenza3 - Facebook - Google + - KarrierOne - Twitch Unknown: - Apple @@ -997,3 +1025,4 @@ account_keys: - mfPjCoE6SX0Sl84MnmNS/LS+tfPpkn7I8tziuk2g0WM= - 5RWlYF22jS9i76zLl8jP2D3D8GC5ht+IP1dWUBGZxi8= genesis: "[fake genesis]" +