Skip to content
Merged
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: 5 additions & 5 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "b1ff61a2fcf20f689849ae270c93dc849c486d80" }
fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "b1ff61a2fcf20f689849ae270c93dc849c486d80" }
fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "b1ff61a2fcf20f689849ae270c93dc849c486d80", package = "fastcrypto-zkp" }
fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "b1ff61a2fcf20f689849ae270c93dc849c486d80", features = [
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "3366c26a746b72707572c4f3f05915e20d5c16c2" }
fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "3366c26a746b72707572c4f3f05915e20d5c16c2" }
fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "3366c26a746b72707572c4f3f05915e20d5c16c2", package = "fastcrypto-zkp" }
fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "3366c26a746b72707572c4f3f05915e20d5c16c2", features = [
"experimental",
] }
passkey-types = { version = "0.2.0" }
Expand Down
1 change: 1 addition & 0 deletions crates/sui-config/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ pub fn default_zklogin_oauth_providers() -> BTreeMap<Chain, BTreeSet<String>> {
"Playtron".to_string(),
"Threedos".to_string(),
"Onefc".to_string(),
"FanTV".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
]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ validator_configs:
- "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
- Credenza3
- Facebook
- FanTV
- Google
- Kakao
- KarrierOne
Expand Down Expand Up @@ -275,6 +276,7 @@ validator_configs:
- "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
- Credenza3
- Facebook
- FanTV
- Google
- Kakao
- KarrierOne
Expand Down Expand Up @@ -430,6 +432,7 @@ validator_configs:
- "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
- Credenza3
- Facebook
- FanTV
- Google
- Kakao
- KarrierOne
Expand Down Expand Up @@ -585,6 +588,7 @@ validator_configs:
- "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
- Credenza3
- Facebook
- FanTV
- Google
- Kakao
- KarrierOne
Expand Down Expand Up @@ -740,6 +744,7 @@ validator_configs:
- "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
- Credenza3
- Facebook
- FanTV
- Google
- Kakao
- KarrierOne
Expand Down Expand Up @@ -895,6 +900,7 @@ validator_configs:
- "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
- Credenza3
- Facebook
- FanTV
- Google
- Kakao
- KarrierOne
Expand Down Expand Up @@ -1050,6 +1056,7 @@ validator_configs:
- "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
- Credenza3
- Facebook
- FanTV
- Google
- Kakao
- KarrierOne
Expand Down
3 changes: 2 additions & 1 deletion crates/sui/src/keytool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ impl KeyToolCommand {
)
.await
.unwrap();
let (_, aud) = parse_and_validate_jwt(&parsed_token).unwrap();
let (_, aud, _) = parse_and_validate_jwt(&parsed_token).unwrap();
let address_seed = gen_address_seed(user_salt, "sub", sub, &aud).unwrap();
let zk_login_inputs =
ZkLoginInputs::from_reader(reader, &address_seed.to_string()).unwrap();
Expand Down Expand Up @@ -1114,6 +1114,7 @@ impl KeyToolCommand {
"https://api.ambrus.studio/callback",
&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}");
println!("Visit URL (Facebook): {url_3}");
Expand Down
2 changes: 1 addition & 1 deletion crates/sui/src/zklogin_commands_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub async fn perform_zk_login_test_tx(
println!("ZkLogin inputs:");
println!("{:?}", serde_json::to_string(&reader).unwrap());

let (sub, aud) = parse_and_validate_jwt(parsed_token)?;
let (sub, aud, _) = parse_and_validate_jwt(parsed_token)?;
let address_seed = gen_address_seed(&user_salt, "sub", &sub, &aud)?;
let zk_login_inputs = ZkLoginInputs::from_reader(reader, &address_seed)?;

Expand Down
Loading