diff --git a/identity-provider-service/Cargo.lock b/identity-provider-service/Cargo.lock index 485443256..2cb085371 100644 --- a/identity-provider-service/Cargo.lock +++ b/identity-provider-service/Cargo.lock @@ -23,7 +23,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check", ] @@ -120,7 +120,7 @@ dependencies = [ "derivative", "digest", "itertools", - "num-bigint 0.4.4", + "num-bigint", "num-traits", "paste", "rustc_version", @@ -143,7 +143,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.4", + "num-bigint", "num-traits", "proc-macro2", "quote", @@ -172,7 +172,7 @@ dependencies = [ "ark-serialize-derive", "ark-std", "digest", - "num-bigint 0.4.4", + "num-bigint", ] [[package]] @@ -193,7 +193,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "concordium-contracts-common" -version = "8.1.1" +version = "9.0.0" dependencies = [ "base64", "bs58", @@ -452,7 +452,7 @@ dependencies = [ "fnv", "hashbrown 0.11.2", "hex", - "num-bigint 0.4.4", + "num-bigint", "num-integer", "num-traits", "rust_decimal", @@ -472,7 +472,7 @@ dependencies = [ [[package]] name = "concordium_base" -version = "3.2.0" +version = "4.0.0" dependencies = [ "anyhow", "ark-bls12-381", @@ -489,16 +489,16 @@ dependencies = [ "derive_more", "ed25519-dalek", "either", - "ff 0.13.0", + "ff", "hex", "itertools", "leb128", "libc", "nom", "num", - "num-bigint 0.4.4", + "num-bigint", "num-traits", - "rand 0.8.5", + "rand", "rayon", "rust_decimal", "serde", @@ -611,9 +611,9 @@ dependencies = [ "curve25519-dalek-derive", "digest", "fiat-crypto", - "group 0.13.0", + "group", "platforms", - "rand_core 0.6.4", + "rand_core", "rustc_version", "subtle", "zeroize", @@ -742,7 +742,7 @@ checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek", "ed25519", - "rand_core 0.6.4", + "rand_core", "serde", "sha2", "subtle", @@ -810,17 +810,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" -[[package]] -name = "ff" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4530da57967e140ee0b44e0143aa66b5cb42bd9c503dbe316a15d5b0be65713e" -dependencies = [ - "byteorder", - "ff_derive", - "rand_core 0.5.1", -] - [[package]] name = "ff" version = "0.13.0" @@ -828,24 +817,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "bitvec", - "rand_core 0.6.4", + "rand_core", "subtle", ] -[[package]] -name = "ff_derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5796e7d62ca01a00ed3a649b0da1ffa1ac8f06bcad40339df09dbdd69a05ba9" -dependencies = [ - "num-bigint 0.2.6", - "num-integer", - "num-traits", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "fiat-crypto" version = "0.2.5" @@ -940,17 +915,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.10" @@ -959,7 +923,7 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -968,25 +932,14 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" -[[package]] -name = "group" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbdfc48f95bef47e3daf3b9d552a1dde6311e3a5fefa43e16c59f651d56fe5b" -dependencies = [ - "ff 0.5.2", - "rand 0.7.3", - "rand_xorshift", -] - [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", - "rand_core 0.6.4", + "ff", + "rand_core", "subtle", ] @@ -1211,7 +1164,6 @@ dependencies = [ "env_logger", "hex", "log", - "pairing", "reqwest", "rust-embed", "serde", @@ -1388,7 +1340,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -1444,7 +1396,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ - "num-bigint 0.4.4", + "num-bigint", "num-complex", "num-integer", "num-iter", @@ -1452,17 +1404,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-bigint" version = "0.4.4" @@ -1511,7 +1452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", - "num-bigint 0.4.4", + "num-bigint", "num-integer", "num-traits", ] @@ -1604,18 +1545,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "pairing" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c40534479a28199cd5109da27fe2fc4a4728e4fc701d9e9c1bded78f3271e4" -dependencies = [ - "byteorder", - "ff 0.5.2", - "group 0.2.0", - "rand_core 0.5.1", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -1788,19 +1717,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -1808,18 +1724,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1829,16 +1735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1847,25 +1744,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_xorshift" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -2044,7 +1923,7 @@ dependencies = [ "borsh", "bytes", "num-traits", - "rand 0.8.5", + "rand", "rkyv", "serde", "serde_json", @@ -2277,7 +2156,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -2645,7 +2524,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.8.5", + "rand", "sha1", "thiserror", "url", @@ -2791,12 +2670,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/identity-provider-service/Cargo.toml b/identity-provider-service/Cargo.toml index ece0c7636..66e95211b 100644 --- a/identity-provider-service/Cargo.toml +++ b/identity-provider-service/Cargo.toml @@ -16,7 +16,6 @@ tokio = { version = "1", features = ["full"] } warp = "0.3" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -pairing = "0.15" log = "0.4.11" env_logger = "0.9" structopt = "0.3" diff --git a/idiss/Cargo.lock b/idiss/Cargo.lock index f2a6276a0..6e6c89277 100644 --- a/idiss/Cargo.lock +++ b/idiss/Cargo.lock @@ -428,7 +428,7 @@ dependencies = [ [[package]] name = "concordium-contracts-common" -version = "8.1.1" +version = "9.0.0" dependencies = [ "base64", "bs58", @@ -457,7 +457,7 @@ dependencies = [ [[package]] name = "concordium_base" -version = "3.2.0" +version = "4.0.0" dependencies = [ "anyhow", "ark-bls12-381", diff --git a/idiss/Cargo.toml b/idiss/Cargo.toml index 7507abedf..49c7ac1d6 100644 --- a/idiss/Cargo.toml +++ b/idiss/Cargo.toml @@ -40,7 +40,7 @@ optional = true [dependencies.concordium_base] path = "../rust-src/concordium_base" -version = "3" +version = "4" features = ["ffi"] [build-dependencies] diff --git a/mobile_wallet/Cargo.lock b/mobile_wallet/Cargo.lock index 5c2ab364f..ddcec5929 100644 --- a/mobile_wallet/Cargo.lock +++ b/mobile_wallet/Cargo.lock @@ -372,7 +372,7 @@ dependencies = [ [[package]] name = "concordium-contracts-common" -version = "8.1.1" +version = "9.0.0" dependencies = [ "base64", "bs58", @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "concordium_base" -version = "3.2.0" +version = "4.0.0" dependencies = [ "anyhow", "ark-bls12-381", diff --git a/mobile_wallet/Cargo.toml b/mobile_wallet/Cargo.toml index be96f642a..3394ff50e 100644 --- a/mobile_wallet/Cargo.toml +++ b/mobile_wallet/Cargo.toml @@ -32,11 +32,11 @@ version = "1.0.0" [dependencies.concordium_base] path = "../rust-src/concordium_base" -version = "3" +version = "4" [build-dependencies.concordium_base] path = "../rust-src/concordium_base" -version = "3" +version = "4" # Use the same optimization level for building build.rs as for the library # itself in release mode. This is necessary because some of the dependencies diff --git a/rust-bins/Cargo.lock b/rust-bins/Cargo.lock index ff2d321ff..a8034a311 100644 --- a/rust-bins/Cargo.lock +++ b/rust-bins/Cargo.lock @@ -460,7 +460,7 @@ dependencies = [ [[package]] name = "concordium-contracts-common" -version = "8.1.1" +version = "9.0.0" dependencies = [ "base64", "bs58", @@ -489,7 +489,7 @@ dependencies = [ [[package]] name = "concordium_base" -version = "3.2.0" +version = "4.0.0" dependencies = [ "aes", "anyhow", diff --git a/rust-src/Cargo.lock b/rust-src/Cargo.lock index 76c1134b5..0daf9f99e 100644 --- a/rust-src/Cargo.lock +++ b/rust-src/Cargo.lock @@ -446,7 +446,7 @@ dependencies = [ [[package]] name = "concordium-contracts-common" -version = "8.1.1" +version = "9.0.0" dependencies = [ "base64", "bs58", @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "concordium_base" -version = "3.2.0" +version = "4.0.0" dependencies = [ "aes", "anyhow", diff --git a/rust-src/concordium_base/CHANGELOG.md b/rust-src/concordium_base/CHANGELOG.md index c275e958e..d1befa676 100644 --- a/rust-src/concordium_base/CHANGELOG.md +++ b/rust-src/concordium_base/CHANGELOG.md @@ -1,5 +1,7 @@ ## Unreleased changes +## 4.0.0 (2024-01-22) + - Add `MultiExp` trait that allows to have different `multiexp` algorithm implementations for different curves. - Improve performance of the generic `multiexp` algorithm. - Add an instance of `MultiExp` that is specific to `curve25519`. diff --git a/rust-src/concordium_base/Cargo.toml b/rust-src/concordium_base/Cargo.toml index a2a6f5a64..1b86b4a59 100644 --- a/rust-src/concordium_base/Cargo.toml +++ b/rust-src/concordium_base/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium_base" -version = "3.2.0" +version = "4.0.0" authors = ["Concordium AG "] edition = "2021" rust-version = "1.65" @@ -62,7 +62,7 @@ crate-type = ["rlib", "staticlib", "cdylib"] # Local dependencies [dependencies.concordium-contracts-common] -version = "8.1" +version = "9.0" path = "../../smart-contracts/contracts-common/concordium-contracts-common" features = ["derive-serde"] diff --git a/smart-contracts/contracts-common/concordium-contracts-common/CHANGELOG.md b/smart-contracts/contracts-common/concordium-contracts-common/CHANGELOG.md index f131e222a..fd2cf271d 100644 --- a/smart-contracts/contracts-common/concordium-contracts-common/CHANGELOG.md +++ b/smart-contracts/contracts-common/concordium-contracts-common/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased changes +## concordium-contracts-common 9.0.0 (2024-01-22) + - Add `SchemaType` implementation for `&str`. - Add missing functionality from `Timestamp` in `concordium-base` to `Timestamp` in this crate, i.e. make internal field `millis` public, implement `From` and add a `now` method. - The `Debug` implementations of `Parameter` and `OwnedParameter` now output the diff --git a/smart-contracts/contracts-common/concordium-contracts-common/Cargo.toml b/smart-contracts/contracts-common/concordium-contracts-common/Cargo.toml index 2dd928afb..e8dda788d 100644 --- a/smart-contracts/contracts-common/concordium-contracts-common/Cargo.toml +++ b/smart-contracts/contracts-common/concordium-contracts-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium-contracts-common" -version = "8.1.1" +version = "9.0.0" authors = ["Concordium "] edition = "2021" rust-version = "1.65" @@ -90,8 +90,8 @@ crate-type = ["rlib"] [dev-dependencies] arbitrary = { version = "1.3", features = ["derive"] } -rand = "=0.7" -rand_pcg = "0.2.1" +rand = "0.8" +rand_pcg = "0.3" [package.metadata.docs.rs] diff --git a/smart-contracts/wasm-chain-integration/CHANGELOG.md b/smart-contracts/wasm-chain-integration/CHANGELOG.md index 0e3077a90..5d6b0e789 100644 --- a/smart-contracts/wasm-chain-integration/CHANGELOG.md +++ b/smart-contracts/wasm-chain-integration/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased changes +## concordium-smart-contract-engine 4.0.0 (2024-01-22) + - Add a `branch_statistics` function to get insight into smart contract state tree structure. - Remove `utils::WasmVersion` to instead reexport a similar type from `concordium_contracts_common`. diff --git a/smart-contracts/wasm-chain-integration/Cargo.lock b/smart-contracts/wasm-chain-integration/Cargo.lock index e9004ff32..f171b4b81 100644 --- a/smart-contracts/wasm-chain-integration/Cargo.lock +++ b/smart-contracts/wasm-chain-integration/Cargo.lock @@ -322,7 +322,7 @@ dependencies = [ [[package]] name = "concordium-contracts-common" -version = "8.1.1" +version = "9.0.0" dependencies = [ "arbitrary", "base64", @@ -352,7 +352,7 @@ dependencies = [ [[package]] name = "concordium-smart-contract-engine" -version = "3.1.0" +version = "4.0.0" dependencies = [ "anyhow", "arbitrary", @@ -379,7 +379,7 @@ dependencies = [ [[package]] name = "concordium-wasm" -version = "3.0.0" +version = "4.0.0" dependencies = [ "anyhow", "concordium-contracts-common", diff --git a/smart-contracts/wasm-chain-integration/Cargo.toml b/smart-contracts/wasm-chain-integration/Cargo.toml index 373838302..9ff7cf3cb 100644 --- a/smart-contracts/wasm-chain-integration/Cargo.toml +++ b/smart-contracts/wasm-chain-integration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium-smart-contract-engine" -version = "3.1.0" +version = "4.0.0" authors = ["Concordium "] edition = "2018" license-file = "../../LICENSE" @@ -42,10 +42,10 @@ rand = { version = "=0.8", features = ["small_rng"] } [dependencies.concordium-wasm] path = "../wasm-transform" -version = "3" +version = "4" [dependencies.concordium-contracts-common] -version = "8.0" +version = "9.0" path = "../contracts-common/concordium-contracts-common" features = ["derive-serde"] diff --git a/smart-contracts/wasm-test/Cargo.lock b/smart-contracts/wasm-test/Cargo.lock index 23f3580e8..854e8e4c6 100644 --- a/smart-contracts/wasm-test/Cargo.lock +++ b/smart-contracts/wasm-test/Cargo.lock @@ -245,7 +245,7 @@ dependencies = [ [[package]] name = "concordium-contracts-common" -version = "8.1.1" +version = "9.0.0" dependencies = [ "base64", "bs58", @@ -274,7 +274,7 @@ dependencies = [ [[package]] name = "concordium-wasm" -version = "3.0.0" +version = "4.0.0" dependencies = [ "anyhow", "concordium-contracts-common", diff --git a/smart-contracts/wasm-transform/CHANGELOG.md b/smart-contracts/wasm-transform/CHANGELOG.md index 4dafc1841..1227d5780 100644 --- a/smart-contracts/wasm-transform/CHANGELOG.md +++ b/smart-contracts/wasm-transform/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased changes +## concordium-wasm 4.0.0 (2024-01-22) + +- Update contracts-common dependency to version 9. + ## concordium-wasm 3.0.0 (2023-08-21) - `validate_module` is now parameterized by `ValidationConfig` which determines diff --git a/smart-contracts/wasm-transform/Cargo.toml b/smart-contracts/wasm-transform/Cargo.toml index a67c3c093..c25c07a49 100644 --- a/smart-contracts/wasm-transform/Cargo.toml +++ b/smart-contracts/wasm-transform/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium-wasm" -version = "3.0.0" +version = "4.0.0" authors = ["Concordium "] edition = "2018" license-file = "../../LICENSE" @@ -21,7 +21,7 @@ derive_more = "0.99" [dependencies.concordium-contracts-common] -version = "8" +version = "9" path = "../contracts-common/concordium-contracts-common" features = ["derive-serde"]