From bcba5bcb49a85daf06b168ee9068db0a0b414928 Mon Sep 17 00:00:00 2001 From: Maksym Zub Date: Fri, 22 Mar 2024 15:14:18 +0100 Subject: [PATCH] bump to stable ink v5.0.0 (#50) --- .github/workflows/checks.yml | 2 +- shielder/PSP22 | 2 +- shielder/contract/Cargo.lock | 134 +++-- shielder/contract/Cargo.toml | 2 +- shielder/contract/lib.rs | 46 +- shielder/drink_tests/Cargo.lock | 569 ++++++++++++--------- shielder/drink_tests/Cargo.toml | 2 +- shielder/drink_tests/src/utils/chain.rs | 11 +- shielder/drink_tests/src/utils/psp22.rs | 16 +- shielder/drink_tests/src/utils/shielder.rs | 8 +- shielder/mocked_zk/Cargo.lock | 98 ++-- shielder/mocked_zk/Cargo.toml | 2 +- 12 files changed, 531 insertions(+), 361 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 8e9a2fc..8935335 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -26,7 +26,7 @@ jobs: run: rustup target add wasm32-unknown-unknown - name: Install cargo-contract - run: cargo install cargo-contract --version 4.0.0-rc.2 + run: cargo install cargo-contract - name: Run checks for `shielder/contract` run: cd shielder/ && make check diff --git a/shielder/PSP22 b/shielder/PSP22 index 2330b07..94a8f73 160000 --- a/shielder/PSP22 +++ b/shielder/PSP22 @@ -1 +1 @@ -Subproject commit 2330b078b42853198b72271f3c02633c4ba17138 +Subproject commit 94a8f7393afef89da9de97957729c60e5b4f6cad diff --git a/shielder/contract/Cargo.lock b/shielder/contract/Cargo.lock index a7f488d..d213c96 100644 --- a/shielder/contract/Cargo.lock +++ b/shielder/contract/Cargo.lock @@ -36,6 +36,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + [[package]] name = "bitvec" version = "1.0.1" @@ -335,9 +341,9 @@ dependencies = [ [[package]] name = "ink" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f0047f1e70ddeae00d45c55bb069d94836ac74d895d2f24c3d6a65ba13b628" +checksum = "3d4a862aedbfda93175ddf75c9aaa2ae4c4b39ee5cee06c16d50bccce05bf5c7" dependencies = [ "derive_more", "ink_env", @@ -346,24 +352,25 @@ dependencies = [ "ink_prelude", "ink_primitives", "ink_storage", + "pallet-contracts-uapi-next", "parity-scale-codec", "scale-info", ] [[package]] name = "ink_allocator" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c1d2eddb445b3ef076dacaa9968a7ff5b80ad5b9b724966fab66a8f4e48bde4" +checksum = "5cee56055bac6d928d425e944c5f3b69baa33c9635822fd1c00cd4afc70fde3e" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d7479eab1bb62f52a13fca02414a65cd4d9d116bbcae97eafd0808ee5f7ba4" +checksum = "70a1f8473fa09e0f9b6f3cb3f8d18c07c14ebf9ea1f7cdfee270f009d45ee8e9" dependencies = [ "blake2", "derive_more", @@ -383,13 +390,14 @@ dependencies = [ [[package]] name = "ink_engine" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99aae25c6820d9e9dae12f79df79a10cba3c961fe1204a68fefaf72f9ae7b14" +checksum = "4f357e2e867f4e222ffc4015a6e61d1073548de89f70a4e36a8b0385562777fa" dependencies = [ "blake2", "derive_more", "ink_primitives", + "pallet-contracts-uapi-next", "parity-scale-codec", "secp256k1", "sha2", @@ -398,9 +406,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8f814ac18100f5ba3d265fbc29e1639325660571883184bedf31dcfecd2428" +checksum = "42cec50b7e4f8406aab25801b015d3802a52d76cfbe48ce11cfb4200fa88e296" dependencies = [ "blake2", "cfg-if", @@ -412,6 +420,7 @@ dependencies = [ "ink_primitives", "ink_storage_traits", "num-traits", + "pallet-contracts-uapi-next", "parity-scale-codec", "paste", "rlibc", @@ -427,12 +436,13 @@ dependencies = [ [[package]] name = "ink_ir" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ff5a0f5d1a7cbced5e4f0e828cfebae7c94948b27de7b6075937f85f58f8a9" +checksum = "3b1ad2975551c4ed800af971289ed6d2c68ac41ffc03a42010b3e01d7360dfb2" dependencies = [ "blake2", "either", + "impl-serde", "ink_prelude", "itertools", "proc-macro2", @@ -442,9 +452,9 @@ dependencies = [ [[package]] name = "ink_macro" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4347620c4ab436e3aa8b0b1ea7da4ea1d09a7281c8d917e01ba2649cabad541" +checksum = "aee1a546f37eae3b3cd223832d31702033c5369dcfa3405899587c110a7908d3" dependencies = [ "ink_codegen", "ink_ir", @@ -458,15 +468,16 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75859c7142101f3ad30a763fd0e5468df164e3d424086df8de40531fb54940f3" +checksum = "a98fcc0ff9292ff68c7ee7b84c93533c9ff13859ec3b148faa822e2da9954fe6" dependencies = [ "derive_more", "impl-serde", "ink_prelude", "ink_primitives", "linkme", + "parity-scale-codec", "scale-info", "schemars", "serde", @@ -474,18 +485,18 @@ dependencies = [ [[package]] name = "ink_prelude" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3fbd55e0cf78e456ad4a92558d55b577bf65944bb37bf7debb8f03ed66a47b" +checksum = "ea1734d058c80aa72e59c8ae75624fd8a51791efba21469f273156c0f4cad5c9" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c976554c1bd075c6722d0f30cc3a8337b7ebaf487b95a40c9e81097d995f921" +checksum = "11ec35ef7f45e67a53b6142d7e7f18e6d9292d76c3a2a1da14cf8423e481813d" dependencies = [ "derive_more", "ink_prelude", @@ -498,9 +509,9 @@ dependencies = [ [[package]] name = "ink_storage" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e3cf99814c37c9cf789a94479cc39fe86e8af0be43e5962080e01fa53ca0e5" +checksum = "bbdb04cad74df858c05bc9cb6f30bbf12da33c3e2cb7ca211749c001fa761aa9" dependencies = [ "array-init", "cfg-if", @@ -510,15 +521,16 @@ dependencies = [ "ink_prelude", "ink_primitives", "ink_storage_traits", + "pallet-contracts-uapi-next", "parity-scale-codec", "scale-info", ] [[package]] name = "ink_storage_traits" -version = "5.0.0-rc" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a469c01b48282a459130ca72a75e57feedbb69ab151639f532156d10d574353" +checksum = "83ce49e3d2935fc1ec3e73117119712b187d3123339f6a31624e92f75fa2293d" dependencies = [ "ink_metadata", "ink_prelude", @@ -559,18 +571,18 @@ checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "linkme" -version = "0.3.22" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b53ad6a33de58864705954edb5ad5d571a010f9e296865ed43dc72a5621b430" +checksum = "bb2cfee0de9bd869589fb9a015e155946d1be5ff415cb844c2caccc6cc4b5db9" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.22" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e542a18c94a9b6fcc7adb090fa3ba6b79ee220a16404f325672729f32a66ff" +checksum = "adf157a4dc5a29b7b464aa8fe7edeff30076e07e13646a1c3874f58477dc99f8" dependencies = [ "proc-macro2", "quote", @@ -618,6 +630,17 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "pallet-contracts-uapi-next" +version = "6.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd549c16296ea5b2eb7c65c56aba548b286c1be4d7675b424ff6ccb8319c97a9" +dependencies = [ + "bitflags", + "paste", + "polkavm-derive", +] + [[package]] name = "parity-scale-codec" version = "3.6.9" @@ -656,6 +679,34 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" +[[package]] +name = "polkavm-common" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b4e215c80fe876147f3d58158d5dfeae7dabdd6047e175af77095b78d0035c" + +[[package]] +name = "polkavm-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6380dbe1fb03ecc74ad55d841cfc75480222d153ba69ddcb00977866cbdabdb8" +dependencies = [ + "polkavm-derive-impl", + "syn 2.0.48", +] + +[[package]] +name = "polkavm-derive-impl" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc8211b3365bbafb2fb32057d68b0e1ca55d079f5cf6f9da9b98079b94b3987d" +dependencies = [ + "polkavm-common", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -768,9 +819,9 @@ dependencies = [ [[package]] name = "scale-decode" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7789f5728e4e954aaa20cadcc370b99096fb8645fca3c9333ace44bb18f30095" +checksum = "7caaf753f8ed1ab4752c6afb20174f03598c664724e0e32628e161c21000ff76" dependencies = [ "derive_more", "parity-scale-codec", @@ -782,9 +833,9 @@ dependencies = [ [[package]] name = "scale-decode-derive" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27873eb6005868f8cc72dcfe109fae664cf51223d35387bc2f28be4c28d94c47" +checksum = "d3475108a1b62c7efd1b5c65974f30109a598b2f45f23c9ae030acb9686966db" dependencies = [ "darling", "proc-macro-crate 1.3.1", @@ -891,9 +942,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.28.1" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f622567e3b4b38154fb8190bcf6b160d7a4301d70595a49195b48c116007a27" +checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ "secp256k1-sys", ] @@ -955,9 +1006,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -1041,14 +1092,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", "syn 2.0.48", - "unicode-xid", ] [[package]] @@ -1097,12 +1147,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "version_check" version = "0.9.4" diff --git a/shielder/contract/Cargo.toml b/shielder/contract/Cargo.toml index c28843e..93e2c05 100644 --- a/shielder/contract/Cargo.toml +++ b/shielder/contract/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/Cardinal-Cryptography/zk-apps" edition = "2021" [dependencies] -ink = { version = "5.0.0-rc", default-features = false } +ink = { version = "5.0.0", default-features = false } mocked_zk = { path = "../mocked_zk", default-features = false } [lib] diff --git a/shielder/contract/lib.rs b/shielder/contract/lib.rs index 0eb0b0e..b09021d 100755 --- a/shielder/contract/lib.rs +++ b/shielder/contract/lib.rs @@ -12,7 +12,9 @@ mod types; #[ink::contract] pub mod contract { - use crate::{errors::ShielderError, merkle::MerkleTree, traits::psp22::PSP22, types::Set}; + use crate::{errors::ShielderError, merkle::MerkleTree, traits::psp22::PSP22Error, types::Set}; + use ink::env::call::{build_call, ExecutionInput, Selector}; + use ink::env::DefaultEnvironment; use mocked_zk::{ops::OpPub, relations::ZkProof, Scalar}; pub const MERKLE_TREE_DEPTH: usize = mocked_zk::MERKLE_TREE_DEPTH; @@ -76,23 +78,39 @@ pub mod contract { amount, token, user, - } => { - let mut psp22: ink::contract_ref!(PSP22) = AccountId::from(token.bytes).into(); - psp22.transfer_from( - AccountId::from(user.bytes), - self.env().account_id(), - amount, - [].to_vec(), - )?; - } + } => build_call::() + .call(AccountId::from(token.bytes)) + .call_v1() + .gas_limit(0) + .transferred_value(0) + .exec_input( + ExecutionInput::new(Selector::new(ink::selector_bytes!( + "PSP22::transfer_from" + ))) + .push_arg(AccountId::from(user.bytes)) + .push_arg(self.env().account_id()) + .push_arg(amount) + .push_arg([].to_vec() as ink::prelude::vec::Vec), + ) + .returns::>() + .invoke()?, OpPub::Withdraw { amount, token, user, - } => { - let mut psp22: ink::contract_ref!(PSP22) = AccountId::from(token.bytes).into(); - psp22.transfer(AccountId::from(user.bytes), amount, [].to_vec())?; - } + } => build_call::() + .call(AccountId::from(token.bytes)) + .call_v1() + .gas_limit(0) + .transferred_value(0) + .exec_input( + ExecutionInput::new(Selector::new(ink::selector_bytes!("PSP22::transfer"))) + .push_arg(AccountId::from(user.bytes)) + .push_arg(amount) + .push_arg([].to_vec() as ink::prelude::vec::Vec), + ) + .returns::>() + .invoke()?, }; Ok(()) } diff --git a/shielder/drink_tests/Cargo.lock b/shielder/drink_tests/Cargo.lock index 1ce8736..9ae10a4 100644 --- a/shielder/drink_tests/Cargo.lock +++ b/shielder/drink_tests/Cargo.lock @@ -168,9 +168,9 @@ dependencies = [ [[package]] name = "aquamarine" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074b80d14d0240b6ce94d68f059a2d26a5d77280ae142662365a21ef6e2594ef" +checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ "include_dir", "itertools 0.10.5", @@ -514,9 +514,9 @@ dependencies = [ [[package]] name = "bollard" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6" +checksum = "83545367eb6428eb35c29cdec3a1f350fa8d6d9085d59a7d7bcb637f2e38db5a" dependencies = [ "base64 0.21.7", "bollard-stubs", @@ -525,8 +525,11 @@ dependencies = [ "futures-util", "hex", "http", + "http-body-util", "hyper", - "hyperlocal", + "hyper-named-pipe", + "hyper-util", + "hyperlocal-next", "log", "pin-project-lite", "serde", @@ -537,15 +540,16 @@ dependencies = [ "thiserror", "tokio", "tokio-util", + "tower-service", "url", "winapi", ] [[package]] name = "bollard-stubs" -version = "1.43.0-rc.2" +version = "1.44.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b58071e8fd9ec1e930efd28e3a90c1251015872a2ce49f81f36421b86466932e" +checksum = "709d9aa1c37abb89d40f19f5d0ad6f0d88cb1581264e571c9350fc5bb89cf1c5" dependencies = [ "serde", "serde_repr", @@ -554,9 +558,9 @@ dependencies = [ [[package]] name = "bounded-collections" -version = "0.1.9" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd" +checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1" dependencies = [ "log", "parity-scale-codec", @@ -689,9 +693,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.1" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", "clap_derive", @@ -699,9 +703,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -711,11 +715,11 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.51", @@ -819,9 +823,9 @@ checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08" [[package]] name = "contract-build" -version = "4.0.0-rc.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c478e9e5b73a2234c17f146a79b249242879c8a33b34fabea3008dd22c8795f" +checksum = "9f4e6c03a261bc36c858fb67f12c21045d372b731b2239372584ded4648b3538" dependencies = [ "anyhow", "blake2", @@ -832,7 +836,7 @@ dependencies = [ "contract-metadata", "crossterm", "duct", - "heck", + "heck 0.4.1", "hex", "impl-serde", "parity-scale-codec", @@ -859,9 +863,9 @@ dependencies = [ [[package]] name = "contract-metadata" -version = "4.0.0-rc.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277c42205552340b5979d27301512e2ca85fb21a0555f786f10d3d5dcf817aa" +checksum = "71d239a78947aa2d0c63a9936754927551f275d3064a221384427c2c2ff1504b" dependencies = [ "anyhow", "impl-serde", @@ -873,9 +877,9 @@ dependencies = [ [[package]] name = "contract-transcode" -version = "4.0.0-rc.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414fce0008626b0e7835ec62caadc1e028bd8f8236a8962c9d38739829d97eb2" +checksum = "3d300ad8af2ba7be1bb77f88be352bdb2e7a78daf998d727128dd090054e1ad3" dependencies = [ "anyhow", "base58", @@ -883,7 +887,7 @@ dependencies = [ "contract-metadata", "escape8259", "hex", - "indexmap 2.2.3", + "indexmap 2.2.5", "ink_env", "ink_metadata", "itertools 0.12.1", @@ -1324,26 +1328,20 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "drink" -version = "0.10.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe74f1b23038c882501682b6ea1ba97be124960adb68a0aea5aa2128a5df2e0" +checksum = "56e900f205099deb7c650899474ae2bcb1c6288e7de4662425c5ba3035513d11" dependencies = [ "contract-metadata", "contract-transcode", "drink-test-macro", - "frame-metadata", "frame-support", "frame-system", - "pallet-balances", - "pallet-contracts", - "pallet-contracts-uapi", - "pallet-timestamp", + "ink_sandbox", "parity-scale-codec", "parity-scale-codec-derive", "scale-info", "serde_json", - "sp-externalities", - "sp-io", "sp-runtime-interface", "thiserror", "wat", @@ -1351,9 +1349,9 @@ dependencies = [ [[package]] name = "drink-test-macro" -version = "0.10.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea166fddef10682aa3ebd1ce9da0fd84e8ca9d5397b70e93fcebac877d53139c" +checksum = "572a9e306ec533f924c0d6c6bd15e7150534a8cd718144c73bd51075a3ea3f40" dependencies = [ "cargo_metadata", "contract-build", @@ -1599,9 +1597,9 @@ dependencies = [ [[package]] name = "frame-benchmarking" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b16f7f853f64ec6fbc981b3e224cc3400752662da140ec62c160b5b859bab68" +checksum = "34134abd64876c2cba150b703d8c74b1b222147e61dbc33cbb9db72f7c1cdb2f" dependencies = [ "frame-support", "frame-support-procedural", @@ -1637,9 +1635,9 @@ dependencies = [ [[package]] name = "frame-support" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48b00bb3e82c465a435b08827e7abe5144345bc1a998848bdd7ce72fa203bb5" +checksum = "40bde5b74ac70a1c9fe4f846220ea10e78b81b0ffcdb567d16d28472bc332f95" dependencies = [ "aquamarine", "array-bytes", @@ -1661,7 +1659,7 @@ dependencies = [ "sp-api", "sp-arithmetic", "sp-core", - "sp-core-hashing-proc-macro", + "sp-crypto-hashing-proc-macro", "sp-debug-derive", "sp-genesis-builder", "sp-inherents", @@ -1679,9 +1677,9 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "23.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be717139a0da9b31b559356db73f6ce48876d331e833ebdc32de3a9ad581e15" +checksum = "c762bf871c6655636a40a74d06f7f1bf69813f8037ad269704ae35b1c56c42ec" dependencies = [ "Inflector", "cfg-expr", @@ -1693,15 +1691,15 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "sp-core-hashing", + "sp-crypto-hashing", "syn 2.0.51", ] [[package]] name = "frame-support-procedural-tools" -version = "10.0.0" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3363df38464c47a73eb521a4f648bfcc7537a82d70347ef8af3f73b6d019e910" +checksum = "5be30b1ce0b477476a3fe13cd8ff479007582340d14f0ddea9e832b01e706a07" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.1.0", @@ -1712,9 +1710,9 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "11.0.0" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68672b9ec6fe72d259d3879dc212c5e42e977588cdac830c76f54d9f492aeb58" +checksum = "ed971c6435503a099bdac99fe4c5bea08981709e5b5a0a8535a1856f48561191" dependencies = [ "proc-macro2", "quote", @@ -1723,9 +1721,9 @@ dependencies = [ [[package]] name = "frame-system" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983b3215c8d97775b90dc1db88f858c46401682bd2fb8572bdd102ff8c2ca2a6" +checksum = "c302f711acf3196b4bf2b4629a07a2ac6e44cd1782434ec88b85d59adfb1204d" dependencies = [ "cfg-if", "docify", @@ -1916,25 +1914,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "h2" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.3", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hash-db" version = "0.16.0" @@ -1980,6 +1959,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.8" @@ -2043,9 +2028,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2054,12 +2039,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", "pin-project-lite", ] @@ -2069,47 +2066,73 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "hyper" -version = "0.14.28" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", "socket2", "tokio", + "tower", "tower-service", "tracing", - "want", ] [[package]] -name = "hyperlocal" -version = "0.8.0" +name = "hyperlocal-next" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" +checksum = "acf569d43fa9848e510358c07b80f4adf34084ddc28c6a4a651ee8474c070dcc" dependencies = [ - "futures-util", "hex", + "http-body-util", "hyper", - "pin-project", + "hyper-util", + "pin-project-lite", "tokio", + "tower-service", ] [[package]] @@ -2218,9 +2241,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.3" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2235,50 +2258,39 @@ checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] name = "ink" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ea2419809cc26d94a3ddfa14b7cd24c1a88e314413ea022da4eb946a6ece8d1" +checksum = "3d4a862aedbfda93175ddf75c9aaa2ae4c4b39ee5cee06c16d50bccce05bf5c7" dependencies = [ "derive_more", - "ink-pallet-contracts-uapi", "ink_env", "ink_macro", "ink_prelude", "ink_primitives", "ink_storage", + "pallet-contracts-uapi-next", "parity-scale-codec", ] -[[package]] -name = "ink-pallet-contracts-uapi" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd3e608f5410d03e529145875eb736305e0d7cae4b989faf54f932eff31bc048" -dependencies = [ - "bitflags 1.3.2", - "paste", - "polkavm-derive", -] - [[package]] name = "ink_allocator" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66999b81e12f6e4e735594394f05e5e8ba8b5d887ce454f62bac9732527c738" +checksum = "5cee56055bac6d928d425e944c5f3b69baa33c9635822fd1c00cd4afc70fde3e" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2954ba6dee05d8b5c1e5f02b8fd79da9480112372df575287daab8eb04c770" +checksum = "70a1f8473fa09e0f9b6f3cb3f8d18c07c14ebf9ea1f7cdfee270f009d45ee8e9" dependencies = [ "blake2", "derive_more", "either", - "heck", + "heck 0.4.1", "impl-serde", "ink_ir", "ink_primitives", @@ -2293,14 +2305,14 @@ dependencies = [ [[package]] name = "ink_engine" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6311f58a385f6301aa0eb7766e13473ab6be7151b9ed90b0f01c6249fa6d29" +checksum = "4f357e2e867f4e222ffc4015a6e61d1073548de89f70a4e36a8b0385562777fa" dependencies = [ "blake2", "derive_more", - "ink-pallet-contracts-uapi", "ink_primitives", + "pallet-contracts-uapi-next", "parity-scale-codec", "secp256k1", "sha2 0.10.8", @@ -2309,21 +2321,21 @@ dependencies = [ [[package]] name = "ink_env" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de851cc0a0d017d69521e0e5d4aeefe78d8a7cb4363a8a22cf673325efd07b5a" +checksum = "42cec50b7e4f8406aab25801b015d3802a52d76cfbe48ce11cfb4200fa88e296" dependencies = [ "blake2", "cfg-if", "const_env", "derive_more", - "ink-pallet-contracts-uapi", "ink_allocator", "ink_engine", "ink_prelude", "ink_primitives", "ink_storage_traits", "num-traits", + "pallet-contracts-uapi-next", "parity-scale-codec", "paste", "rlibc", @@ -2339,9 +2351,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49f6dacab06e99c460266b9f0c3d61f4a3fdf3ff51fb31a9cb9171a2356f12c" +checksum = "3b1ad2975551c4ed800af971289ed6d2c68ac41ffc03a42010b3e01d7360dfb2" dependencies = [ "blake2", "either", @@ -2355,9 +2367,9 @@ dependencies = [ [[package]] name = "ink_macro" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f079e17d0d7a2bf18b35edc5312951d5de1d7bbddbb4e79ffda2a05361a4c3" +checksum = "aee1a546f37eae3b3cd223832d31702033c5369dcfa3405899587c110a7908d3" dependencies = [ "ink_codegen", "ink_ir", @@ -2371,9 +2383,9 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0400c331aab950f0483638962e45049f1e40bf0102d4a7bf8428e6d15c798278" +checksum = "a98fcc0ff9292ff68c7ee7b84c93533c9ff13859ec3b148faa822e2da9954fe6" dependencies = [ "derive_more", "impl-serde", @@ -2388,18 +2400,18 @@ dependencies = [ [[package]] name = "ink_prelude" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd2ed651848272442a9e41cd35405aa31c3ca9c6267254d2d84643c8163c69f3" +checksum = "ea1734d058c80aa72e59c8ae75624fd8a51791efba21469f273156c0f4cad5c9" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e6d5e9f34949655f4102916078ed8cef5d8c869f1d3a516b4d3683bf614415" +checksum = "11ec35ef7f45e67a53b6142d7e7f18e6d9292d76c3a2a1da14cf8423e481813d" dependencies = [ "derive_more", "ink_prelude", @@ -2410,28 +2422,49 @@ dependencies = [ "xxhash-rust", ] +[[package]] +name = "ink_sandbox" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503461a34d86043375b4206fec7c3f46e9efafa7b6617290ad3430142296801a" +dependencies = [ + "frame-metadata", + "frame-support", + "frame-system", + "pallet-balances", + "pallet-contracts", + "pallet-timestamp", + "parity-scale-codec", + "paste", + "scale-info", + "sp-core", + "sp-externalities", + "sp-io", + "wat", +] + [[package]] name = "ink_storage" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ed7c502daf1ce4c10ca45848242f851d0818bed49942312f1390d54f88440e" +checksum = "bbdb04cad74df858c05bc9cb6f30bbf12da33c3e2cb7ca211749c001fa761aa9" dependencies = [ "array-init", "cfg-if", "derive_more", - "ink-pallet-contracts-uapi", "ink_env", "ink_prelude", "ink_primitives", "ink_storage_traits", + "pallet-contracts-uapi-next", "parity-scale-codec", ] [[package]] name = "ink_storage_traits" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566bca9c7755422c6aa87d13ff1bcd802e3f555ebfb4578272f5b0edeae115a" +checksum = "83ce49e3d2935fc1ec3e73117119712b187d3123339f6a31624e92f75fa2293d" dependencies = [ "ink_metadata", "ink_prelude", @@ -2604,18 +2637,18 @@ dependencies = [ [[package]] name = "linkme" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a78816ac097580aa7fd9d2e9cc7395dda34367c07267a8657516d4ad5e2e3d3" +checksum = "bb2cfee0de9bd869589fb9a015e155946d1be5ff415cb844c2caccc6cc4b5db9" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee9023a564f8bf7fe3da285a50c3e70de0df3e2bf277ff7c4e76d66008ef93b0" +checksum = "adf157a4dc5a29b7b464aa8fe7edeff30076e07e13646a1c3874f58477dc99f8" dependencies = [ "proc-macro2", "quote", @@ -3009,10 +3042,11 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8406b5616e468d80972b6365f3cd8211d0dbf4d107b379fac85fddcfdf0b5562" +checksum = "f68b79a1f9f10c63377177155a4ac3ac08db356027a3d8bc826e1af65c885b8d" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -3025,9 +3059,9 @@ dependencies = [ [[package]] name = "pallet-contracts" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c24580e4e9b9c000f62be094e1be4cd92cf1e0b5ec54b9b6fb78cc6ed8f3efc" +checksum = "9d67a473c8b28c22d998cc948fa2131ce2981af23dd65a5f7199518ac6d02c86" dependencies = [ "bitflags 1.3.2", "environmental", @@ -3057,9 +3091,9 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" -version = "18.0.0" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e65fc5412a9f0a56a9c53e5f6f73351086e6ca125b0d38c3f612eef7d251d007" +checksum = "c46c4f00188ed27e1cbe8eab750147d63daf25e9b7d66749646cf46d8a21ab96" dependencies = [ "proc-macro2", "quote", @@ -3068,22 +3102,33 @@ dependencies = [ [[package]] name = "pallet-contracts-uapi" -version = "5.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a992d0815b9dc36acbe0800b05b4f875398bb9d9b1aa15c8b1afdcb87f66df2a" +checksum = "a0a220fabeb1e7484f691248aa68101dc045ef8dc2cad5b5cc88c31df022c6e6" dependencies = [ "bitflags 1.3.2", "parity-scale-codec", "paste", - "polkavm-derive", + "polkavm-derive 0.5.0", "scale-info", ] +[[package]] +name = "pallet-contracts-uapi-next" +version = "6.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd549c16296ea5b2eb7c65c56aba548b286c1be4d7675b424ff6ccb8319c97a9" +dependencies = [ + "bitflags 1.3.2", + "paste", + "polkavm-derive 0.5.0", +] + [[package]] name = "pallet-timestamp" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688b89bdd377609b592bd094b304ebca33f4767fe72935465e2fd7db0e797968" +checksum = "c307589adc04a0d578ae00231bc04f1a53ef07a0aa2f3e9d4c7e4bf419bf6e3d" dependencies = [ "docify", "frame-benchmarking", @@ -3102,9 +3147,9 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b4ca7a1af9b1f091900a354a96319c7614d7a32106ba86cb7f0b6f90239065" +checksum = "6d598d0ad779d19fa44ce6f80c57192537fa9f84995953bf2a8c104b7676b6b7" dependencies = [ "frame-support", "frame-system", @@ -3244,9 +3289,9 @@ checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "polkadot-core-primitives" -version = "7.0.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda2b0f0c580c38f12445a4af10e0a23acf48381b2a95653e0be48ba787e10e5" +checksum = "89a881f63ab7a652aba19300f95f9341ee245ad45a3f89cf02053ecace474769" dependencies = [ "parity-scale-codec", "scale-info", @@ -3257,9 +3302,9 @@ dependencies = [ [[package]] name = "polkadot-parachain-primitives" -version = "6.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b37c55955147479e7b2f3c2e5385db4846ac3e3b997cd4a4ad52344524b5447" +checksum = "567c738aa6b8d7eb113fe73e50fb9b6292f818f54da98bb25c7fe73e98d1709a" dependencies = [ "bounded-collections", "derive_more", @@ -3275,32 +3320,69 @@ dependencies = [ [[package]] name = "polkavm-common" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecd2caacfc4a7ee34243758dd7348859e6dec73f5e5df059890f5742ee46f0e" +checksum = "88b4e215c80fe876147f3d58158d5dfeae7dabdd6047e175af77095b78d0035c" + +[[package]] +name = "polkavm-common" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92c99f7eee94e7be43ba37eef65ad0ee8cbaf89b7c00001c3f6d2be985cb1817" [[package]] name = "polkavm-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db65a500d4adf574893c726ae365e37e4fbb7f2cbd403f6eaa1b665457456adc" +checksum = "6380dbe1fb03ecc74ad55d841cfc75480222d153ba69ddcb00977866cbdabdb8" dependencies = [ - "polkavm-derive-impl", + "polkavm-derive-impl 0.5.0", "syn 2.0.51", ] +[[package]] +name = "polkavm-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79fa916f7962348bd1bb1a65a83401675e6fc86c51a0fdbcf92a3108e58e6125" +dependencies = [ + "polkavm-derive-impl-macro", +] + [[package]] name = "polkavm-derive-impl" -version = "0.4.0" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc8211b3365bbafb2fb32057d68b0e1ca55d079f5cf6f9da9b98079b94b3987d" +dependencies = [ + "polkavm-common 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "polkavm-derive-impl" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c99f4e7a9ff434ef9c885b874c99d824c3a5693bf5e3e8569bb1d2245a8c1b7f" +checksum = "c10b2654a8a10a83c260bfb93e97b262cf0017494ab94a65d389e0eda6de6c9c" dependencies = [ - "polkavm-common", + "polkavm-common 0.8.0", "proc-macro2", "quote", "syn 2.0.51", ] +[[package]] +name = "polkavm-derive-impl-macro" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66" +dependencies = [ + "polkavm-derive-impl 0.8.0", + "syn 2.0.51", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3696,9 +3778,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "2ef2175c2907e7c8bc0a9c3f86aeb5ec1f3b275300ad58a44d0c3ae379a5e52e" dependencies = [ "bitvec", "cfg-if", @@ -3946,7 +4028,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.3", + "indexmap 2.2.5", "serde", "serde_derive", "serde_json", @@ -4112,9 +4194,9 @@ dependencies = [ [[package]] name = "sp-api" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dea138c6dbf282ab57756492f0232ea0a08575ca9cbe2b7b1ead49000f238a7" +checksum = "298331cb47a948244f6fb4921b5cbeece267d72139fb90760993b6ec37b2212c" dependencies = [ "hash-db", "log", @@ -4125,6 +4207,7 @@ dependencies = [ "sp-externalities", "sp-metadata-ir", "sp-runtime", + "sp-runtime-interface", "sp-state-machine", "sp-std", "sp-trie", @@ -4134,9 +4217,9 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "15.0.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0694be2891593450916d6b53a274d234bccbc86bcbada36ba23fc356989070c7" +checksum = "18cfbb3ae0216e842dfb805ea8e896e85b07a7c34d432a6c7b7d770924431ed2" dependencies = [ "Inflector", "blake2", @@ -4149,9 +4232,9 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "30.0.0" +version = "32.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4fe7a9b7fa9da76272b201e2fb3c7900d97d32a46b66af9a04dad457f73c71" +checksum = "0b4b7b12922cb90cf8dff0cab14087ba0ca25c1f04ba060c7294ce42c78d89ab" dependencies = [ "parity-scale-codec", "scale-info", @@ -4163,9 +4246,9 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "23.0.0" +version = "25.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42721f072b421f292a072e8f52a3b3c0fbc27428f0c9fe24067bc47046bad63" +checksum = "910c07fa263b20bf7271fdd4adcb5d3217dfdac14270592e0780223542e7e114" dependencies = [ "integer-sqrt", "num-traits", @@ -4178,9 +4261,9 @@ dependencies = [ [[package]] name = "sp-core" -version = "28.0.0" +version = "30.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f230cb12575455070da0fc174815958423a0b9a641d5e304a9457113c7cb4007" +checksum = "586e0d5185e4545f465fc9a04fb9c4572d3e294137312496db2b67b0bb579e1f" dependencies = [ "array-bytes", "bip39", @@ -4208,7 +4291,7 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing", + "sp-crypto-hashing", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -4223,10 +4306,10 @@ dependencies = [ ] [[package]] -name = "sp-core-hashing" -version = "15.0.0" +name = "sp-crypto-hashing" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0f4990add7b2cefdeca883c0efa99bb4d912cb2196120e1500c0cc099553b0" +checksum = "bc9927a7f81334ed5b8a98a4a978c81324d12bd9713ec76b5c68fd410174c5eb" dependencies = [ "blake2b_simd", "byteorder", @@ -4237,13 +4320,13 @@ dependencies = [ ] [[package]] -name = "sp-core-hashing-proc-macro" -version = "15.0.0" +name = "sp-crypto-hashing-proc-macro" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7527f8dda7667c41009b2cd0efaddcb81709b9741bd5ee6d17b11bad835cc698" +checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b" dependencies = [ "quote", - "sp-core-hashing", + "sp-crypto-hashing", "syn 2.0.51", ] @@ -4260,9 +4343,9 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63867ec85950ced90d4ab1bba902a47db1b1efdf2829f653945669b2bb470a9c" +checksum = "a1d6a4572eadd4a63cff92509a210bf425501a0c5e76574b30a366ac77653787" dependencies = [ "environmental", "parity-scale-codec", @@ -4272,9 +4355,9 @@ dependencies = [ [[package]] name = "sp-genesis-builder" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfdc79df83221ec5a279cbbd08fd6f8be164b9b081c8e84593ce2c2ebd5d66c0" +checksum = "a862db099e8a799417b63ea79c90079811cdf68fcf3013d81cdceeddcec8f142" dependencies = [ "serde_json", "sp-api", @@ -4284,9 +4367,9 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3caf2d1288549d7e6c32b453f2d4855d498bb88600101011e35653e022a6f2" +checksum = "42eb3c88572c7c80e7ecb6365601a490350b09d11000fcc7839efd304e172177" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -4299,9 +4382,9 @@ dependencies = [ [[package]] name = "sp-io" -version = "30.0.0" +version = "32.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55f26d89feedaf0faf81688b6e1e1e81329cd8b4c6a4fd6c5b97ed9dd068b8a" +checksum = "0ca29e042628cb94cbcaefa935e624a9b48f9230dbce6324908e9b4f768317ef" dependencies = [ "bytes", "ed25519-dalek", @@ -4311,6 +4394,7 @@ dependencies = [ "rustversion", "secp256k1", "sp-core", + "sp-crypto-hashing", "sp-externalities", "sp-keystore", "sp-runtime-interface", @@ -4324,15 +4408,14 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.34.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96806a28a62ed9ddecd0b28857b1344d029390f7c5c42a2ff9199cbf5638635c" +checksum = "bd4bf9e5fa486416c92c2bb497b7ce2c43eac80cbdc407ffe2d34b365694ac29" dependencies = [ "parity-scale-codec", "parking_lot", "sp-core", "sp-externalities", - "thiserror", ] [[package]] @@ -4360,9 +4443,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "31.0.1" +version = "33.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3bb49a4475d390198dfd3d41bef4564ab569fbaf1b5e38ae69b35fc01199d91" +checksum = "b28fcf8f53d917e420e783dd27d06fd276f55160301c5bc977cc5898c4130f6f" dependencies = [ "docify", "either", @@ -4385,13 +4468,14 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "24.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f66b66d8cec3d785fa6289336c1d9cbd4305d5d84f7134378c4d79ed7983e6fb" +checksum = "e48a675ea4858333d4d755899ed5ed780174aa34fec15953428d516af5452295" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", + "polkavm-derive 0.8.0", "primitive-types", "sp-externalities", "sp-runtime-interface-proc-macro", @@ -4404,9 +4488,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "17.0.0" +version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfaf6e85b2ec12a4b99cd6d8d57d083e30c94b7f1b0d8f93547121495aae6f0c" +checksum = "0195f32c628fee3ce1dfbbf2e7e52a30ea85f3589da9fe62a8b816d70fc06294" dependencies = [ "Inflector", "expander", @@ -4418,9 +4502,9 @@ dependencies = [ [[package]] name = "sp-staking" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0e68be3fff84dd8ee552f9d13dd2e9eab3663e0bddfc6c6c88de02aaca1e311" +checksum = "48b92f4f66b40cbf7cf00d7808d8eec16e25cb420a29ec4060a74c0e9f7c2938" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -4433,9 +4517,9 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.35.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718c779ad1d6fcc0be64c7ce030b33fa44b5c8914b3a1319ef63bb5f27fb98df" +checksum = "23ae47765916d342b53d07be012a71efc4c1377d875ade31340cc4fb784b9921" dependencies = [ "hash-db", "log", @@ -4461,9 +4545,9 @@ checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" [[package]] name = "sp-storage" -version = "19.0.0" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb92d7b24033a8a856d6e20dd980b653cbd7af7ec471cc988b1b7c1d2e3a32b" +checksum = "8dba5791cb3978e95daf99dad919ecb3ec35565604e88cd38d805d9d4981e8bd" dependencies = [ "impl-serde", "parity-scale-codec", @@ -4475,9 +4559,9 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "26.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347eaddd5b07856ccec69ac3300e72e392a5efc3aea5fb4b7230888a0b447b9e" +checksum = "ee9532c2e4c8fcd7753cb4c741daeb8d9e3ac7cbc15a84c78d4c96492ed20eba" dependencies = [ "async-trait", "parity-scale-codec", @@ -4502,9 +4586,9 @@ dependencies = [ [[package]] name = "sp-trie" -version = "29.0.0" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4d24d84a0beb44a71dcac1b41980e1edf7fb722c7f3046710136a283cd479b" +checksum = "5791e2e310cf88abedbd5f60ff3d9c9a09d95b182b4a7510f3648a2170ace593" dependencies = [ "ahash 0.8.9", "hash-db", @@ -4527,16 +4611,16 @@ dependencies = [ [[package]] name = "sp-version" -version = "29.0.0" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afd1b053394347e22f541696bca4a9ac3ec848b50d1b86f5018d2b771f39f11a" +checksum = "973478ac076be7cb8e0a7968ee43cd7c46fb26e323d36020a9f3bb229e033cd2" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro", + "sp-crypto-hashing-proc-macro", "sp-runtime", "sp-std", "sp-version-proc-macro", @@ -4571,9 +4655,9 @@ dependencies = [ [[package]] name = "sp-weights" -version = "27.0.0" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e874bdf9dd3fd3242f5b7867a4eaedd545b02f29041a46d222a9d9d5caaaa5c" +checksum = "ab8a9c7a1b64fa7dba38622ad1de26f0b2e595727c0e42c7b109ecb8e7120688" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -4624,9 +4708,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-xcm" -version = "7.0.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df18af00766d22926916bb443f14742c65cc6b2f0fe997b8f26da0d0f9ee9ca" +checksum = "3028e3a4ee8493767ee66266571f5cf1fc3edc546bba650b2040c5418b318340" dependencies = [ "array-bytes", "bounded-collections", @@ -4643,9 +4727,9 @@ dependencies = [ [[package]] name = "staging-xcm-builder" -version = "7.0.3" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ba4f214fe99d79ffcc266f431abbb32d3596788327b925d469c7bb6a3c84d3c" +checksum = "6ea27e235bcca331e5ba693fd224fcc16c17b53f53fca875c8dc54b733dba3c6" dependencies = [ "frame-support", "frame-system", @@ -4666,9 +4750,9 @@ dependencies = [ [[package]] name = "staging-xcm-executor" -version = "7.0.3" +version = "9.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1dea1e33eefee513c197c24255670951a2c515a6ce2c7049fe86385400074f" +checksum = "fe8c62fe1eee71592828a513693106ff301cdafd5ac5bd52e06d9315fd4f4f7a" dependencies = [ "environmental", "frame-benchmarking", @@ -4725,7 +4809,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4738,7 +4822,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4811,9 +4895,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.10.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", @@ -5005,7 +5089,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.2.5", "toml_datetime", "winnow 0.5.40", ] @@ -5016,7 +5100,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.2.5", "toml_datetime", "winnow 0.5.40", ] @@ -5027,7 +5111,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.2.5", "toml_datetime", "winnow 0.5.40", ] @@ -5038,13 +5122,35 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ - "indexmap 2.2.3", + "indexmap 2.2.5", "serde", "serde_spanned", "toml_datetime", "winnow 0.6.2", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -5057,6 +5163,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5295,9 +5402,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -5924,9 +6031,9 @@ dependencies = [ [[package]] name = "xcm-procedural" -version = "7.0.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7998facd751c42ec9b11a4cf71fcdb41fb147c5c8db8bcd1281fe84f8760d515" +checksum = "f4717a97970a9cda70d7db53cf50d2615c2f6f6b7c857445325b4a39ea7aa2cd" dependencies = [ "Inflector", "proc-macro2", diff --git a/shielder/drink_tests/Cargo.toml b/shielder/drink_tests/Cargo.toml index 5cf8723..75fee76 100644 --- a/shielder/drink_tests/Cargo.toml +++ b/shielder/drink_tests/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -drink = { version = "0.10.0" } +drink = { version = "0.15.0" } rand = { version = "0.8.5", default-features = false } anyhow = { version = "1.0.79", default-features = false } mocked_zk = { path = "../mocked_zk", default-features = false } diff --git a/shielder/drink_tests/src/utils/chain.rs b/shielder/drink_tests/src/utils/chain.rs index 6b30f3b..5fe0f19 100644 --- a/shielder/drink_tests/src/utils/chain.rs +++ b/shielder/drink_tests/src/utils/chain.rs @@ -1,26 +1,27 @@ use anyhow::Result; -use drink::{runtime::MinimalRuntime, session::Session, AccountId32}; +use drink::sandbox_api::balance_api::BalanceAPI; +use drink::{minimal::MinimalSandbox, session::Session, AccountId32}; use crate::utils::ACCOUNT_INITIAL_AMOUNT; pub fn init_acc_with_balance( - session: &mut Session, + session: &mut Session, acc: &AccountId32, ) -> Result<()> { session .sandbox() - .mint_into(acc.clone(), ACCOUNT_INITIAL_AMOUNT) + .mint_into(&acc.clone(), ACCOUNT_INITIAL_AMOUNT) .unwrap(); Ok(()) } -pub fn init_alice(session: &mut Session) -> Result { +pub fn init_alice(session: &mut Session) -> Result { let res = AccountId32::new([2u8; 32]); init_acc_with_balance(session, &res)?; Ok(res) } -pub fn init_bob(session: &mut Session) -> Result { +pub fn init_bob(session: &mut Session) -> Result { let res = AccountId32::new([3u8; 32]); init_acc_with_balance(session, &res)?; Ok(res) diff --git a/shielder/drink_tests/src/utils/psp22.rs b/shielder/drink_tests/src/utils/psp22.rs index fc66846..973337b 100644 --- a/shielder/drink_tests/src/utils/psp22.rs +++ b/shielder/drink_tests/src/utils/psp22.rs @@ -1,12 +1,12 @@ use anyhow::Result; use drink::{ - runtime::MinimalRuntime, - session::{Session, NO_ENDOWMENT, NO_SALT}, - AccountId32, ContractBundle, + minimal::MinimalSandbox, + session::{bundle::ContractBundle, Session, NO_ENDOWMENT, NO_SALT}, + AccountId32, }; pub fn deploy_test_token( - session: &mut Session, + session: &mut Session, supply: u128, ) -> Result { let psp22_bundle = @@ -27,7 +27,7 @@ pub fn deploy_test_token( } pub fn get_psp22_balance( - session: &mut Session, + session: &mut Session, token: &AccountId32, address: &AccountId32, ) -> Result { @@ -41,7 +41,7 @@ pub fn get_psp22_balance( } pub fn get_psp22_allowance( - session: &mut Session, + session: &mut Session, token: &AccountId32, from: &AccountId32, to: &AccountId32, @@ -56,7 +56,7 @@ pub fn get_psp22_allowance( } pub fn psp22_approve( - session: &mut Session, + session: &mut Session, token: &AccountId32, to: &AccountId32, amount: u128, @@ -71,7 +71,7 @@ pub fn psp22_approve( } pub fn psp22_transfer( - session: &mut Session, + session: &mut Session, token: &AccountId32, to: &AccountId32, amount: u128, diff --git a/shielder/drink_tests/src/utils/shielder.rs b/shielder/drink_tests/src/utils/shielder.rs index ad975b5..513b8f3 100644 --- a/shielder/drink_tests/src/utils/shielder.rs +++ b/shielder/drink_tests/src/utils/shielder.rs @@ -1,6 +1,6 @@ use anyhow::Result; use drink::{ - runtime::MinimalRuntime, + minimal::MinimalSandbox, session::{Session, NO_ARGS, NO_ENDOWMENT, NO_SALT}, AccountId32, }; @@ -24,7 +24,7 @@ pub struct ShielderUserEnv { } pub fn deploy_shielder( - session: &mut Session, + session: &mut Session, token: &AccountId32, ) -> Result { let shielder_bundle = BundleProvider::ShielderContract.bundle()?; @@ -41,7 +41,7 @@ pub fn deploy_shielder( } pub fn create_shielder_account( - session: &mut Session, + session: &mut Session, shielder_address: &AccountId32, token: &AccountId32, nullifier: Scalar, @@ -76,7 +76,7 @@ pub fn create_shielder_account( } pub fn shielder_update( - session: &mut Session, + session: &mut Session, shielder_address: &AccountId32, upd_op: UpdateOperation, user_shielded_data: ShielderUserEnv, diff --git a/shielder/mocked_zk/Cargo.lock b/shielder/mocked_zk/Cargo.lock index 1f480f7..19c0a5e 100644 --- a/shielder/mocked_zk/Cargo.lock +++ b/shielder/mocked_zk/Cargo.lock @@ -338,47 +338,36 @@ dependencies = [ [[package]] name = "ink" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ea2419809cc26d94a3ddfa14b7cd24c1a88e314413ea022da4eb946a6ece8d1" +checksum = "3d4a862aedbfda93175ddf75c9aaa2ae4c4b39ee5cee06c16d50bccce05bf5c7" dependencies = [ "derive_more", - "ink-pallet-contracts-uapi", "ink_env", "ink_macro", "ink_metadata", "ink_prelude", "ink_primitives", "ink_storage", + "pallet-contracts-uapi-next", "parity-scale-codec", "scale-info", ] -[[package]] -name = "ink-pallet-contracts-uapi" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd3e608f5410d03e529145875eb736305e0d7cae4b989faf54f932eff31bc048" -dependencies = [ - "bitflags", - "paste", - "polkavm-derive", -] - [[package]] name = "ink_allocator" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e66999b81e12f6e4e735594394f05e5e8ba8b5d887ce454f62bac9732527c738" +checksum = "5cee56055bac6d928d425e944c5f3b69baa33c9635822fd1c00cd4afc70fde3e" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2954ba6dee05d8b5c1e5f02b8fd79da9480112372df575287daab8eb04c770" +checksum = "70a1f8473fa09e0f9b6f3cb3f8d18c07c14ebf9ea1f7cdfee270f009d45ee8e9" dependencies = [ "blake2", "derive_more", @@ -398,14 +387,14 @@ dependencies = [ [[package]] name = "ink_engine" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6311f58a385f6301aa0eb7766e13473ab6be7151b9ed90b0f01c6249fa6d29" +checksum = "4f357e2e867f4e222ffc4015a6e61d1073548de89f70a4e36a8b0385562777fa" dependencies = [ "blake2", "derive_more", - "ink-pallet-contracts-uapi", "ink_primitives", + "pallet-contracts-uapi-next", "parity-scale-codec", "secp256k1", "sha2", @@ -414,21 +403,21 @@ dependencies = [ [[package]] name = "ink_env" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de851cc0a0d017d69521e0e5d4aeefe78d8a7cb4363a8a22cf673325efd07b5a" +checksum = "42cec50b7e4f8406aab25801b015d3802a52d76cfbe48ce11cfb4200fa88e296" dependencies = [ "blake2", "cfg-if", "const_env", "derive_more", - "ink-pallet-contracts-uapi", "ink_allocator", "ink_engine", "ink_prelude", "ink_primitives", "ink_storage_traits", "num-traits", + "pallet-contracts-uapi-next", "parity-scale-codec", "paste", "rlibc", @@ -444,9 +433,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49f6dacab06e99c460266b9f0c3d61f4a3fdf3ff51fb31a9cb9171a2356f12c" +checksum = "3b1ad2975551c4ed800af971289ed6d2c68ac41ffc03a42010b3e01d7360dfb2" dependencies = [ "blake2", "either", @@ -460,9 +449,9 @@ dependencies = [ [[package]] name = "ink_macro" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f079e17d0d7a2bf18b35edc5312951d5de1d7bbddbb4e79ffda2a05361a4c3" +checksum = "aee1a546f37eae3b3cd223832d31702033c5369dcfa3405899587c110a7908d3" dependencies = [ "ink_codegen", "ink_ir", @@ -476,9 +465,9 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0400c331aab950f0483638962e45049f1e40bf0102d4a7bf8428e6d15c798278" +checksum = "a98fcc0ff9292ff68c7ee7b84c93533c9ff13859ec3b148faa822e2da9954fe6" dependencies = [ "derive_more", "impl-serde", @@ -493,18 +482,18 @@ dependencies = [ [[package]] name = "ink_prelude" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd2ed651848272442a9e41cd35405aa31c3ca9c6267254d2d84643c8163c69f3" +checksum = "ea1734d058c80aa72e59c8ae75624fd8a51791efba21469f273156c0f4cad5c9" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e6d5e9f34949655f4102916078ed8cef5d8c869f1d3a516b4d3683bf614415" +checksum = "11ec35ef7f45e67a53b6142d7e7f18e6d9292d76c3a2a1da14cf8423e481813d" dependencies = [ "derive_more", "ink_prelude", @@ -517,28 +506,28 @@ dependencies = [ [[package]] name = "ink_storage" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ed7c502daf1ce4c10ca45848242f851d0818bed49942312f1390d54f88440e" +checksum = "bbdb04cad74df858c05bc9cb6f30bbf12da33c3e2cb7ca211749c001fa761aa9" dependencies = [ "array-init", "cfg-if", "derive_more", - "ink-pallet-contracts-uapi", "ink_env", "ink_metadata", "ink_prelude", "ink_primitives", "ink_storage_traits", + "pallet-contracts-uapi-next", "parity-scale-codec", "scale-info", ] [[package]] name = "ink_storage_traits" -version = "5.0.0-rc.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566bca9c7755422c6aa87d13ff1bcd802e3f555ebfb4578272f5b0edeae115a" +checksum = "83ce49e3d2935fc1ec3e73117119712b187d3123339f6a31624e92f75fa2293d" dependencies = [ "ink_metadata", "ink_prelude", @@ -579,18 +568,18 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "linkme" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a78816ac097580aa7fd9d2e9cc7395dda34367c07267a8657516d4ad5e2e3d3" +checksum = "bb2cfee0de9bd869589fb9a015e155946d1be5ff415cb844c2caccc6cc4b5db9" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee9023a564f8bf7fe3da285a50c3e70de0df3e2bf277ff7c4e76d66008ef93b0" +checksum = "adf157a4dc5a29b7b464aa8fe7edeff30076e07e13646a1c3874f58477dc99f8" dependencies = [ "proc-macro2", "quote", @@ -638,6 +627,17 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "pallet-contracts-uapi-next" +version = "6.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd549c16296ea5b2eb7c65c56aba548b286c1be4d7675b424ff6ccb8319c97a9" +dependencies = [ + "bitflags", + "paste", + "polkavm-derive", +] + [[package]] name = "parity-scale-codec" version = "3.6.9" @@ -678,15 +678,15 @@ checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "polkavm-common" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecd2caacfc4a7ee34243758dd7348859e6dec73f5e5df059890f5742ee46f0e" +checksum = "88b4e215c80fe876147f3d58158d5dfeae7dabdd6047e175af77095b78d0035c" [[package]] name = "polkavm-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db65a500d4adf574893c726ae365e37e4fbb7f2cbd403f6eaa1b665457456adc" +checksum = "6380dbe1fb03ecc74ad55d841cfc75480222d153ba69ddcb00977866cbdabdb8" dependencies = [ "polkavm-derive-impl", "syn 2.0.51", @@ -694,9 +694,9 @@ dependencies = [ [[package]] name = "polkavm-derive-impl" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c99f4e7a9ff434ef9c885b874c99d824c3a5693bf5e3e8569bb1d2245a8c1b7f" +checksum = "dc8211b3365bbafb2fb32057d68b0e1ca55d079f5cf6f9da9b98079b94b3987d" dependencies = [ "polkavm-common", "proc-macro2", diff --git a/shielder/mocked_zk/Cargo.toml b/shielder/mocked_zk/Cargo.toml index e6e6501..3886b14 100644 --- a/shielder/mocked_zk/Cargo.toml +++ b/shielder/mocked_zk/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ink = { version = "5.0.0-rc", default-features = false } +ink = { version = "5.0.0", default-features = false } serde = { version = "1.0.197", default-features = false, features = ["derive"] } [features]