diff --git a/Cargo.lock b/Cargo.lock index 498a5bded0bcb..423e16e677663 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4633,7 +4633,7 @@ dependencies = [ [[package]] name = "fastcrypto" version = "0.1.8" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=bf155b75ef11c577d9ffef93a2a4f62b427a3a6a#bf155b75ef11c577d9ffef93a2a4f62b427a3a6a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=c050ffc78b93739328af5d59b05f90e0e26b1b7e#c050ffc78b93739328af5d59b05f90e0e26b1b7e" dependencies = [ "aes", "aes-gcm", @@ -4687,7 +4687,7 @@ dependencies = [ [[package]] name = "fastcrypto-derive" version = "0.1.3" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=bf155b75ef11c577d9ffef93a2a4f62b427a3a6a#bf155b75ef11c577d9ffef93a2a4f62b427a3a6a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=c050ffc78b93739328af5d59b05f90e0e26b1b7e#c050ffc78b93739328af5d59b05f90e0e26b1b7e" dependencies = [ "quote 1.0.35", "syn 1.0.107", @@ -4696,7 +4696,7 @@ dependencies = [ [[package]] name = "fastcrypto-tbls" version = "0.1.0" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=bf155b75ef11c577d9ffef93a2a4f62b427a3a6a#bf155b75ef11c577d9ffef93a2a4f62b427a3a6a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=c050ffc78b93739328af5d59b05f90e0e26b1b7e#c050ffc78b93739328af5d59b05f90e0e26b1b7e" dependencies = [ "bcs", "digest 0.10.7", @@ -4715,7 +4715,7 @@ dependencies = [ [[package]] name = "fastcrypto-vdf" version = "0.1.0" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=bf155b75ef11c577d9ffef93a2a4f62b427a3a6a#bf155b75ef11c577d9ffef93a2a4f62b427a3a6a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=c050ffc78b93739328af5d59b05f90e0e26b1b7e#c050ffc78b93739328af5d59b05f90e0e26b1b7e" dependencies = [ "bcs", "fastcrypto", @@ -4732,7 +4732,7 @@ dependencies = [ [[package]] name = "fastcrypto-zkp" version = "0.1.3" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=bf155b75ef11c577d9ffef93a2a4f62b427a3a6a#bf155b75ef11c577d9ffef93a2a4f62b427a3a6a" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=c050ffc78b93739328af5d59b05f90e0e26b1b7e#c050ffc78b93739328af5d59b05f90e0e26b1b7e" dependencies = [ "ark-bn254", "ark-ec", diff --git a/Cargo.toml b/Cargo.toml index bc4d199ef3fc2..f05a2bc822e86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -572,10 +572,10 @@ move-abstract-interpreter = { path = "external-crates/move/crates/move-abstract- move-abstract-stack = { path = "external-crates/move/crates/move-abstract-stack" } move-analyzer = { path = "external-crates/move/crates/move-analyzer" } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "bf155b75ef11c577d9ffef93a2a4f62b427a3a6a" } -fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "bf155b75ef11c577d9ffef93a2a4f62b427a3a6a" } -fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "bf155b75ef11c577d9ffef93a2a4f62b427a3a6a", package = "fastcrypto-zkp" } -fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "bf155b75ef11c577d9ffef93a2a4f62b427a3a6a", features = [ +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c050ffc78b93739328af5d59b05f90e0e26b1b7e" } +fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c050ffc78b93739328af5d59b05f90e0e26b1b7e" } +fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c050ffc78b93739328af5d59b05f90e0e26b1b7e", package = "fastcrypto-zkp" } +fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "c050ffc78b93739328af5d59b05f90e0e26b1b7e", features = [ "experimental", ] } passkey-types = { version = "0.2.0" } diff --git a/crates/sui-config/src/node.rs b/crates/sui-config/src/node.rs index 6047be00a3769..d318e1e95a581 100644 --- a/crates/sui-config/src/node.rs +++ b/crates/sui-config/src/node.rs @@ -277,6 +277,7 @@ pub fn default_zklogin_oauth_providers() -> BTreeMap> { "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 "Arden".to_string(), // Arden partner + "AwsTenant-region:eu-west-3-tenant_id:eu-west-3_gGVCx53Es".to_string(), // Trace, external partner ]); // providers that are available for mainnet and testnet. 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 d659fc05c526e..0602ac47887bc 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 @@ -123,6 +123,7 @@ validator_configs: Unknown: - Apple - Arden + - "AwsTenant-region:eu-west-3-tenant_id:eu-west-3_gGVCx53Es" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" - Credenza3 @@ -286,6 +287,7 @@ validator_configs: Unknown: - Apple - Arden + - "AwsTenant-region:eu-west-3-tenant_id:eu-west-3_gGVCx53Es" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" - Credenza3 @@ -449,6 +451,7 @@ validator_configs: Unknown: - Apple - Arden + - "AwsTenant-region:eu-west-3-tenant_id:eu-west-3_gGVCx53Es" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" - Credenza3 @@ -612,6 +615,7 @@ validator_configs: Unknown: - Apple - Arden + - "AwsTenant-region:eu-west-3-tenant_id:eu-west-3_gGVCx53Es" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" - Credenza3 @@ -775,6 +779,7 @@ validator_configs: Unknown: - Apple - Arden + - "AwsTenant-region:eu-west-3-tenant_id:eu-west-3_gGVCx53Es" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" - Credenza3 @@ -938,6 +943,7 @@ validator_configs: Unknown: - Apple - Arden + - "AwsTenant-region:eu-west-3-tenant_id:eu-west-3_gGVCx53Es" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" - Credenza3 @@ -1101,6 +1107,7 @@ validator_configs: Unknown: - Apple - Arden + - "AwsTenant-region:eu-west-3-tenant_id:eu-west-3_gGVCx53Es" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A" - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8" - Credenza3 diff --git a/crates/sui/src/keytool.rs b/crates/sui/src/keytool.rs index 3e8149563d9bb..08e4aabefee40 100644 --- a/crates/sui/src/keytool.rs +++ b/crates/sui/src/keytool.rs @@ -1122,6 +1122,14 @@ impl KeyToolCommand { "https://www.sui.io", &jwt_randomness, )?; + let url_15 = get_oidc_url( + OIDCProvider::AwsTenant(("eu-west-3".to_string(), "trace".to_string())), + &eph_pk_bytes, + max_epoch, + "trace-dev", + "https://trace.fan", + &jwt_randomness, + )?; // This is only for CLI testing. If frontend apps will be built, no need to add anything here. println!("Visit URL (Google): {url}"); println!("Visit URL (Twitch): {url_2}"); @@ -1138,6 +1146,7 @@ impl KeyToolCommand { println!("Visit URL (Credenza3): {url_12}"); println!("Visit URL (AWS - Ambrus): {url_13}"); println!("Visit URL (Arden): {url_14}"); + println!("Visit URL (AWS - Trace): {url_15}"); println!("Finish login and paste the entire URL here (e.g. https://sui.io/#id_token=...):");