From e3501403162849dc8eb897607365bf233897437e Mon Sep 17 00:00:00 2001 From: Max Murphy Date: Tue, 3 Sep 2024 02:08:46 +0200 Subject: [PATCH] fix(rust): Update ic-cdk --- rust/guards/Cargo.lock | 55 ++++++++++++++++-- rust/guards/Cargo.toml | 4 +- rust/parallel_calls/Cargo.lock | 57 +++++++++++++++++-- rust/parallel_calls/src/callee/Cargo.toml | 2 +- rust/parallel_calls/src/caller/Cargo.toml | 2 +- .../src/parallel_calls_backend/Cargo.toml | 2 +- rust/threshold-schnorr/Cargo.lock | 55 ++++++++++++++++-- .../src/schnorr_example_rust/Cargo.toml | 2 +- 8 files changed, 157 insertions(+), 22 deletions(-) diff --git a/rust/guards/Cargo.lock b/rust/guards/Cargo.lock index 8be0cbcb4..f2a4e179f 100644 --- a/rust/guards/Cargo.lock +++ b/rust/guards/Cargo.lock @@ -547,8 +547,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8859bc2b863a77750acf199e1fb7e3fc403e1b475855ba13f59cb4e4036d238" dependencies = [ "candid", - "ic-cdk-macros", - "ic0", + "ic-cdk-macros 0.13.2", + "ic0 0.21.1", + "serde", + "serde_bytes", +] + +[[package]] +name = "ic-cdk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038ff230bf0fc8630943e3c52e989d248a7c89834ccb65da408fabc5817a475b" +dependencies = [ + "candid", + "ic-cdk-macros 0.15.0", + "ic0 0.23.0", "serde", "serde_bytes", ] @@ -563,17 +576,31 @@ dependencies = [ "proc-macro2", "quote", "serde", - "serde_tokenstream", + "serde_tokenstream 0.1.7", "syn 1.0.109", ] +[[package]] +name = "ic-cdk-macros" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af44fb4ec3a4b18831c9d3303ca8fa2ace846c4022d50cb8df4122635d3782e" +dependencies = [ + "candid", + "proc-macro2", + "quote", + "serde", + "serde_tokenstream 0.2.2", + "syn 2.0.60", +] + [[package]] name = "ic-fun-with-guards" version = "0.1.0" dependencies = [ "assert_matches", "candid", - "ic-cdk", + "ic-cdk 0.15.1", "pocket-ic", "scopeguard", "serde", @@ -585,6 +612,12 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a54b5297861c651551676e8c43df805dad175cc33bc97dbd992edbbb85dcbcdf" +[[package]] +name = "ic0" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de254dd67bbd58073e23dc1c8553ba12fa1dc610a19de94ad2bbcd0460c067f" + [[package]] name = "ic_principal" version = "0.1.1" @@ -841,7 +874,7 @@ dependencies = [ "base64 0.13.1", "candid", "hex", - "ic-cdk", + "ic-cdk 0.13.2", "reqwest", "schemars", "serde", @@ -1198,6 +1231,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "serde_tokenstream" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64060d864397305347a78851c51588fd283767e7e7589829e8121d65512340f1" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "syn 2.0.60", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" diff --git a/rust/guards/Cargo.toml b/rust/guards/Cargo.toml index 0166dcbb6..836e10843 100644 --- a/rust/guards/Cargo.toml +++ b/rust/guards/Cargo.toml @@ -8,10 +8,10 @@ crate-type = ["cdylib"] [dependencies] candid = "0.10" -ic-cdk = "0.13" +ic-cdk = "0.15" scopeguard = "1.2.0" serde = "1.0" [dev-dependencies] assert_matches = "1.5.0" -pocket-ic = "3.1.0" \ No newline at end of file +pocket-ic = "3.1.0" diff --git a/rust/parallel_calls/Cargo.lock b/rust/parallel_calls/Cargo.lock index 2a6f410eb..9e240ce83 100644 --- a/rust/parallel_calls/Cargo.lock +++ b/rust/parallel_calls/Cargo.lock @@ -149,7 +149,7 @@ name = "callee" version = "0.1.0" dependencies = [ "candid", - "ic-cdk", + "ic-cdk 0.15.1", ] [[package]] @@ -158,7 +158,7 @@ version = "0.1.0" dependencies = [ "candid", "futures", - "ic-cdk", + "ic-cdk 0.15.1", ] [[package]] @@ -585,8 +585,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8859bc2b863a77750acf199e1fb7e3fc403e1b475855ba13f59cb4e4036d238" dependencies = [ "candid", - "ic-cdk-macros", - "ic0", + "ic-cdk-macros 0.13.2", + "ic0 0.21.1", + "serde", + "serde_bytes", +] + +[[package]] +name = "ic-cdk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038ff230bf0fc8630943e3c52e989d248a7c89834ccb65da408fabc5817a475b" +dependencies = [ + "candid", + "ic-cdk-macros 0.15.0", + "ic0 0.23.0", "serde", "serde_bytes", ] @@ -601,16 +614,36 @@ dependencies = [ "proc-macro2", "quote", "serde", - "serde_tokenstream", + "serde_tokenstream 0.1.7", "syn 1.0.109", ] +[[package]] +name = "ic-cdk-macros" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af44fb4ec3a4b18831c9d3303ca8fa2ace846c4022d50cb8df4122635d3782e" +dependencies = [ + "candid", + "proc-macro2", + "quote", + "serde", + "serde_tokenstream 0.2.2", + "syn 2.0.66", +] + [[package]] name = "ic0" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a54b5297861c651551676e8c43df805dad175cc33bc97dbd992edbbb85dcbcdf" +[[package]] +name = "ic0" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de254dd67bbd58073e23dc1c8553ba12fa1dc610a19de94ad2bbcd0460c067f" + [[package]] name = "ic_principal" version = "0.1.1" @@ -874,7 +907,7 @@ dependencies = [ "base64 0.13.1", "candid", "hex", - "ic-cdk", + "ic-cdk 0.13.2", "reqwest", "schemars", "serde", @@ -1225,6 +1258,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "serde_tokenstream" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64060d864397305347a78851c51588fd283767e7e7589829e8121d65512340f1" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "syn 2.0.66", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" diff --git a/rust/parallel_calls/src/callee/Cargo.toml b/rust/parallel_calls/src/callee/Cargo.toml index 177703284..7e14cb100 100644 --- a/rust/parallel_calls/src/callee/Cargo.toml +++ b/rust/parallel_calls/src/callee/Cargo.toml @@ -10,4 +10,4 @@ crate-type = ["cdylib"] [dependencies] candid = "0.10" -ic-cdk = "0.13" +ic-cdk = "0.15" diff --git a/rust/parallel_calls/src/caller/Cargo.toml b/rust/parallel_calls/src/caller/Cargo.toml index 2bbd8c24e..5ac98faa6 100644 --- a/rust/parallel_calls/src/caller/Cargo.toml +++ b/rust/parallel_calls/src/caller/Cargo.toml @@ -10,5 +10,5 @@ crate-type = ["cdylib"] [dependencies] candid = "0.10" -ic-cdk = "0.13" +ic-cdk = "0.15" futures = "0.3" diff --git a/rust/parallel_calls/src/parallel_calls_backend/Cargo.toml b/rust/parallel_calls/src/parallel_calls_backend/Cargo.toml index e7db9d9c6..dc733daa9 100644 --- a/rust/parallel_calls/src/parallel_calls_backend/Cargo.toml +++ b/rust/parallel_calls/src/parallel_calls_backend/Cargo.toml @@ -10,5 +10,5 @@ crate-type = ["cdylib"] [dependencies] candid = "0.10" -ic-cdk = "0.13" +ic-cdk = "0.15" ic-cdk-timers = "0.7" # Feel free to remove this dependency if you don't need timers diff --git a/rust/threshold-schnorr/Cargo.lock b/rust/threshold-schnorr/Cargo.lock index acde75390..43a0495c1 100644 --- a/rust/threshold-schnorr/Cargo.lock +++ b/rust/threshold-schnorr/Cargo.lock @@ -717,8 +717,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8859bc2b863a77750acf199e1fb7e3fc403e1b475855ba13f59cb4e4036d238" dependencies = [ "candid", - "ic-cdk-macros", - "ic0", + "ic-cdk-macros 0.13.2", + "ic0 0.21.1", + "serde", + "serde_bytes", +] + +[[package]] +name = "ic-cdk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038ff230bf0fc8630943e3c52e989d248a7c89834ccb65da408fabc5817a475b" +dependencies = [ + "candid", + "ic-cdk-macros 0.15.0", + "ic0 0.23.0", "serde", "serde_bytes", ] @@ -733,16 +746,36 @@ dependencies = [ "proc-macro2", "quote", "serde", - "serde_tokenstream", + "serde_tokenstream 0.1.7", "syn 1.0.109", ] +[[package]] +name = "ic-cdk-macros" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af44fb4ec3a4b18831c9d3303ca8fa2ace846c4022d50cb8df4122635d3782e" +dependencies = [ + "candid", + "proc-macro2", + "quote", + "serde", + "serde_tokenstream 0.2.2", + "syn 2.0.48", +] + [[package]] name = "ic0" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a54b5297861c651551676e8c43df805dad175cc33bc97dbd992edbbb85dcbcdf" +[[package]] +name = "ic0" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de254dd67bbd58073e23dc1c8553ba12fa1dc610a19de94ad2bbcd0460c067f" + [[package]] name = "ic_principal" version = "0.1.1" @@ -1023,7 +1056,7 @@ dependencies = [ "base64 0.13.1", "candid", "hex", - "ic-cdk", + "ic-cdk 0.13.2", "reqwest", "schemars", "serde", @@ -1326,7 +1359,7 @@ dependencies = [ "flate2", "getrandom", "hex", - "ic-cdk", + "ic-cdk 0.15.1", "k256", "pocket-ic", "serde", @@ -1439,6 +1472,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "serde_tokenstream" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64060d864397305347a78851c51588fd283767e7e7589829e8121d65512340f1" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "syn 2.0.48", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" diff --git a/rust/threshold-schnorr/src/schnorr_example_rust/Cargo.toml b/rust/threshold-schnorr/src/schnorr_example_rust/Cargo.toml index 130faf991..f720950b4 100644 --- a/rust/threshold-schnorr/src/schnorr_example_rust/Cargo.toml +++ b/rust/threshold-schnorr/src/schnorr_example_rust/Cargo.toml @@ -12,7 +12,7 @@ candid = "=0.10.4" ed25519-dalek = "2.1" getrandom = { version = "0.2", features = ["custom"] } hex = "0.4" -ic-cdk = "0.13" +ic-cdk = "0.15" k256 = { git = "https://github.com/altkdf/elliptic-curves", branch = "schnorr_canister", features = ["schnorr"] } sha2 = "0.10" serde = "1.0"