From 8386f2c6fc1158e0aa57b2b43050ba40bf456669 Mon Sep 17 00:00:00 2001 From: deuszx Date: Mon, 6 Mar 2023 16:15:40 +0100 Subject: [PATCH 1/2] Update contracts to stable ink4. --- contracts/access_control/Cargo.lock | 68 ++++++----- contracts/access_control/Cargo.toml | 2 +- contracts/adder/Cargo.toml | 2 +- contracts/button/Cargo.lock | 173 +++++++++++++--------------- contracts/button/Cargo.toml | 5 +- contracts/button/lib.rs | 4 +- contracts/game_token/Cargo.lock | 173 +++++++++++++--------------- contracts/game_token/Cargo.toml | 4 +- contracts/marketplace/Cargo.lock | 173 +++++++++++++--------------- contracts/marketplace/Cargo.toml | 5 +- contracts/marketplace/lib.rs | 2 +- contracts/simple_dex/Cargo.lock | 173 +++++++++++++--------------- contracts/simple_dex/Cargo.toml | 4 +- contracts/simple_dex/lib.rs | 2 +- contracts/ticket_token/Cargo.lock | 173 +++++++++++++--------------- contracts/ticket_token/Cargo.toml | 4 +- contracts/wrapped_azero/Cargo.lock | 173 +++++++++++++--------------- contracts/wrapped_azero/Cargo.toml | 5 +- 18 files changed, 544 insertions(+), 601 deletions(-) diff --git a/contracts/access_control/Cargo.lock b/contracts/access_control/Cargo.lock index 210372b28d..54592ffa00 100644 --- a/contracts/access_control/Cargo.lock +++ b/contracts/access_control/Cargo.lock @@ -238,8 +238,9 @@ dependencies = [ [[package]] name = "ink" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc4ef9b97c97cf7444ff3931e8cc6287353b48595f7155f8f7c0e6b94b1225" dependencies = [ "derive_more", "ink_env", @@ -253,16 +254,18 @@ dependencies = [ [[package]] name = "ink_allocator" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54dbbaffb0f97bcae062e628dcdc9da4d3c9044f5a53fb2715a328b07221631" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283b022679ef75898db5c28b89388412d93f91cea4f0b1443426901cb391b079" dependencies = [ "blake2", "derive_more", @@ -284,8 +287,9 @@ dependencies = [ [[package]] name = "ink_engine" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daed9b710cba6f50f1fa0372a7e8a47a35624d84af4ef2c3a8d34d4e96202d1c" dependencies = [ "blake2", "derive_more", @@ -298,8 +302,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41c6a3f4e740e27449f805ed47f536a35fb254ebcd03d2480014589331cda3e" dependencies = [ "arrayref", "blake2", @@ -324,8 +329,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "946b940d26e69ded558daafead0979f25f2e9d7e2cf86027f250c3942aa4d0f1" dependencies = [ "blake2", "either", @@ -337,8 +343,9 @@ dependencies = [ [[package]] name = "ink_macro" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6642450e6169cfaf81717b1d62b2abae48a6b41d3f70f885b6aeff7bb14ea96b" dependencies = [ "ink_codegen", "ink_ir", @@ -352,8 +359,9 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfcfa666ada5729c7e4d3d986cd196365a2c469459fced4fa31dc6ad87c4d8f" dependencies = [ "derive_more", "impl-serde", @@ -365,16 +373,18 @@ dependencies = [ [[package]] name = "ink_prelude" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8080235e5ae921975c2c7772fe9959e1b3c92b4d5a1afcfe104f93fb79aa268" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b3f711d857d2de7c08158369cc32a762833ac211a00aac7931992094e25741" dependencies = [ "derive_more", "ink_prelude", @@ -385,8 +395,9 @@ dependencies = [ [[package]] name = "ink_storage" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2872a5ea4559433381b2d82b08b6acd33ce934b07a22ce951c6f00483680c950" dependencies = [ "array-init", "cfg-if", @@ -402,8 +413,9 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c90e11b60233ae5ab877854739da2c380a337cb31b3900cb50328821c0381b6" dependencies = [ "ink_metadata", "ink_prelude", @@ -629,18 +641,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550fc3b723a478be77bf74718947cdcdd75144d508aaa70f0a320036905df2a8" +checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8058e28ae464daf5ac14c5c0f78110b58616e796c4e4e28cfcca38fdb13d8f22" +checksum = "642a62736682fdd8c71da0eb273e453c8ac74e33b9fb310e22ba5b03ec7651ff" dependencies = [ "cc", ] diff --git a/contracts/access_control/Cargo.toml b/contracts/access_control/Cargo.toml index 04b059180a..4c31a9da37 100644 --- a/contracts/access_control/Cargo.toml +++ b/contracts/access_control/Cargo.toml @@ -7,7 +7,7 @@ publish = false license = "Apache 2.0" [dependencies] -ink = { git = "https://github.com/paritytech/ink", rev = "4655a8b4413cb50cbc38d1b7c173ad426ab06cde", default-features = false} +ink = { version = "~4.0.0", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } diff --git a/contracts/adder/Cargo.toml b/contracts/adder/Cargo.toml index b55dd2fac2..926091182b 100644 --- a/contracts/adder/Cargo.toml +++ b/contracts/adder/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] anyhow = "*" -ink = { version = "4.0.0-beta", default-features = false } +ink = { version = "~4.0.0", default-features = false } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } diff --git a/contracts/button/Cargo.lock b/contracts/button/Cargo.lock index e9d200c2fe..bd77e7e7e2 100644 --- a/contracts/button/Cargo.lock +++ b/contracts/button/Cargo.lock @@ -364,31 +364,34 @@ dependencies = [ [[package]] name = "ink" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc4ef9b97c97cf7444ff3931e8cc6287353b48595f7155f8f7c0e6b94b1225" dependencies = [ "derive_more", "ink_env", "ink_macro", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage", "parity-scale-codec", ] [[package]] name = "ink_allocator" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54dbbaffb0f97bcae062e628dcdc9da4d3c9044f5a53fb2715a328b07221631" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283b022679ef75898db5c28b89388412d93f91cea4f0b1443426901cb391b079" dependencies = [ "blake2 0.10.4", "derive_more", @@ -396,8 +399,8 @@ dependencies = [ "env_logger", "heck 0.4.0", "impl-serde", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "itertools", "log", "parity-scale-codec", @@ -410,12 +413,13 @@ dependencies = [ [[package]] name = "ink_engine" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daed9b710cba6f50f1fa0372a7e8a47a35624d84af4ef2c3a8d34d4e96202d1c" dependencies = [ "blake2 0.10.4", "derive_more", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_primitives", "parity-scale-codec", "secp256k1", "sha2", @@ -424,8 +428,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41c6a3f4e740e27449f805ed47f536a35fb254ebcd03d2480014589331cda3e" dependencies = [ "arrayref", "blake2 0.10.4", @@ -434,8 +439,8 @@ dependencies = [ "ink_allocator", "ink_engine", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "num-traits", "parity-scale-codec", @@ -450,22 +455,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf2ee9acbf86d5b2b6342266972217b61117c6468c81bdefe23e052beb05af1" -dependencies = [ - "blake2 0.10.4", - "either", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ink_ir" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "946b940d26e69ded558daafead0979f25f2e9d7e2cf86027f250c3942aa4d0f1" dependencies = [ "blake2 0.10.4", "either", @@ -477,12 +469,13 @@ dependencies = [ [[package]] name = "ink_macro" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6642450e6169cfaf81717b1d62b2abae48a6b41d3f70f885b6aeff7bb14ea96b" dependencies = [ "ink_codegen", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "parity-scale-codec", "proc-macro2", "quote", @@ -492,53 +485,35 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfcfa666ada5729c7e4d3d986cd196365a2c469459fced4fa31dc6ad87c4d8f" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "scale-info", "serde", ] [[package]] name = "ink_prelude" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5962125f78304bc2b3083391cbd579125c64ce17e61b019034094faf772c915a" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ink_prelude" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "f8080235e5ae921975c2c7772fe9959e1b3c92b4d5a1afcfe104f93fb79aa268" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f4f26208fe23e12d436917697b951252519484134a3561fe8b65a5abc97aa9" +checksum = "f1b3f711d857d2de7c08158369cc32a762833ac211a00aac7931992094e25741" dependencies = [ "derive_more", - "ink_prelude 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec", - "xxhash-rust", -] - -[[package]] -name = "ink_primitives" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" -dependencies = [ - "derive_more", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", "parity-scale-codec", "scale-info", "xxhash-rust", @@ -546,16 +521,17 @@ dependencies = [ [[package]] name = "ink_storage" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2872a5ea4559433381b2d82b08b6acd33ce934b07a22ce951c6f00483680c950" dependencies = [ "array-init", "cfg-if", "derive_more", "ink_env", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "parity-scale-codec", "scale-info", @@ -563,12 +539,13 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c90e11b60233ae5ab877854739da2c380a337cb31b3900cb50328821c0381b6" dependencies = [ "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "parity-scale-codec", "scale-info", "syn", @@ -669,7 +646,7 @@ dependencies = [ [[package]] name = "obce" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "ink", "ink_engine", @@ -681,18 +658,20 @@ dependencies = [ [[package]] name = "obce-codegen" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "blake2 0.10.4", + "itertools", "proc-macro2", "quote", "syn", + "tuple", ] [[package]] name = "obce-macro" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "obce-codegen", "proc-macro2", @@ -714,8 +693,8 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openbrush" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_contracts", @@ -726,8 +705,8 @@ dependencies = [ [[package]] name = "openbrush_contracts" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_lang", @@ -738,8 +717,8 @@ dependencies = [ [[package]] name = "openbrush_lang" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "const_format", "ink", @@ -751,15 +730,15 @@ dependencies = [ [[package]] name = "openbrush_lang_codegen" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "blake2 0.9.2", "cargo_metadata", "fs2", "heck 0.3.3", - "ink_ir 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", + "ink_ir", + "ink_primitives", "proc-macro2", "quote", "serde", @@ -771,8 +750,8 @@ dependencies = [ [[package]] name = "openbrush_lang_macro" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "openbrush_lang_codegen", "proc-macro2", @@ -783,7 +762,7 @@ dependencies = [ [[package]] name = "pallet-assets-chain-extension" version = "0.1.1" -source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?tag=3.0.0-beta#7e553468e9c0fbd4f543ccb950b3d17b548237f1" +source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?branch=polkadot-v0.9.37#f8ea374186df2a3fc139c8d585719e58d83df582" dependencies = [ "ink", "obce", @@ -939,18 +918,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550fc3b723a478be77bf74718947cdcdd75144d508aaa70f0a320036905df2a8" +checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8058e28ae464daf5ac14c5c0f78110b58616e796c4e4e28cfcca38fdb13d8f22" +checksum = "642a62736682fdd8c71da0eb273e453c8ac74e33b9fb310e22ba5b03ec7651ff" dependencies = [ "cc", ] @@ -1116,6 +1095,16 @@ dependencies = [ "serde", ] +[[package]] +name = "tuple" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a40ba241047e1174c927dc5f61c141a166b938d61a2ff61838441368cc7d0e" +dependencies = [ + "num-traits", + "serde", +] + [[package]] name = "typenum" version = "1.15.0" diff --git a/contracts/button/Cargo.toml b/contracts/button/Cargo.toml index a8468f8320..4793d4d492 100644 --- a/contracts/button/Cargo.toml +++ b/contracts/button/Cargo.toml @@ -5,13 +5,12 @@ authors = ["Cardinal Cryptography"] edition = "2021" [dependencies] -ink = { git = "https://github.com/paritytech/ink", rev = "4655a8b4413cb50cbc38d1b7c173ad426ab06cde", default-features = false} +ink = { version = "~4.0.0", default-features = false } +openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts/", tag = "3.0.0", default-features = false, features = ["psp22"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } -openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts.git", rev = "3.0.0-beta", default-features = false, features = ["psp22"] } - access_control = { path = "../access_control", default-features = false, features = ["ink-as-dependency"] } game_token = { path = "../game_token", default-features = false, features = ["ink-as-dependency"] } ticket_token = { path = "../ticket_token", default-features = false, features = ["ink-as-dependency"] } diff --git a/contracts/button/lib.rs b/contracts/button/lib.rs index 10aeea5a14..95f93a6750 100644 --- a/contracts/button/lib.rs +++ b/contracts/button/lib.rs @@ -343,7 +343,7 @@ pub mod button_game { vec![], ) .call_flags(CallFlags::default().set_allow_reentry(true)) - .fire()???; + .invoke()?; Ok(()) } @@ -390,7 +390,7 @@ pub mod button_game { ) -> ButtonResult<()> { PSP22Ref::transfer_from_builder(&self.ticket_token, from, to, value, vec![]) .call_flags(CallFlags::default().set_allow_reentry(true)) - .fire()???; + .invoke()?; Ok(()) } diff --git a/contracts/game_token/Cargo.lock b/contracts/game_token/Cargo.lock index 844a60cb54..2fbc60eb7b 100644 --- a/contracts/game_token/Cargo.lock +++ b/contracts/game_token/Cargo.lock @@ -350,31 +350,34 @@ dependencies = [ [[package]] name = "ink" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc4ef9b97c97cf7444ff3931e8cc6287353b48595f7155f8f7c0e6b94b1225" dependencies = [ "derive_more", "ink_env", "ink_macro", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage", "parity-scale-codec", ] [[package]] name = "ink_allocator" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54dbbaffb0f97bcae062e628dcdc9da4d3c9044f5a53fb2715a328b07221631" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283b022679ef75898db5c28b89388412d93f91cea4f0b1443426901cb391b079" dependencies = [ "blake2 0.10.4", "derive_more", @@ -382,8 +385,8 @@ dependencies = [ "env_logger", "heck 0.4.0", "impl-serde", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "itertools", "log", "parity-scale-codec", @@ -396,12 +399,13 @@ dependencies = [ [[package]] name = "ink_engine" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daed9b710cba6f50f1fa0372a7e8a47a35624d84af4ef2c3a8d34d4e96202d1c" dependencies = [ "blake2 0.10.4", "derive_more", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_primitives", "parity-scale-codec", "secp256k1", "sha2", @@ -410,8 +414,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41c6a3f4e740e27449f805ed47f536a35fb254ebcd03d2480014589331cda3e" dependencies = [ "arrayref", "blake2 0.10.4", @@ -420,8 +425,8 @@ dependencies = [ "ink_allocator", "ink_engine", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "num-traits", "parity-scale-codec", @@ -436,22 +441,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf2ee9acbf86d5b2b6342266972217b61117c6468c81bdefe23e052beb05af1" -dependencies = [ - "blake2 0.10.4", - "either", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ink_ir" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "946b940d26e69ded558daafead0979f25f2e9d7e2cf86027f250c3942aa4d0f1" dependencies = [ "blake2 0.10.4", "either", @@ -463,12 +455,13 @@ dependencies = [ [[package]] name = "ink_macro" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6642450e6169cfaf81717b1d62b2abae48a6b41d3f70f885b6aeff7bb14ea96b" dependencies = [ "ink_codegen", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "parity-scale-codec", "proc-macro2", "quote", @@ -478,53 +471,35 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfcfa666ada5729c7e4d3d986cd196365a2c469459fced4fa31dc6ad87c4d8f" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "scale-info", "serde", ] [[package]] name = "ink_prelude" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5962125f78304bc2b3083391cbd579125c64ce17e61b019034094faf772c915a" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ink_prelude" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "f8080235e5ae921975c2c7772fe9959e1b3c92b4d5a1afcfe104f93fb79aa268" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f4f26208fe23e12d436917697b951252519484134a3561fe8b65a5abc97aa9" +checksum = "f1b3f711d857d2de7c08158369cc32a762833ac211a00aac7931992094e25741" dependencies = [ "derive_more", - "ink_prelude 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec", - "xxhash-rust", -] - -[[package]] -name = "ink_primitives" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" -dependencies = [ - "derive_more", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", "parity-scale-codec", "scale-info", "xxhash-rust", @@ -532,16 +507,17 @@ dependencies = [ [[package]] name = "ink_storage" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2872a5ea4559433381b2d82b08b6acd33ce934b07a22ce951c6f00483680c950" dependencies = [ "array-init", "cfg-if", "derive_more", "ink_env", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "parity-scale-codec", "scale-info", @@ -549,12 +525,13 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c90e11b60233ae5ab877854739da2c380a337cb31b3900cb50328821c0381b6" dependencies = [ "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "parity-scale-codec", "scale-info", "syn", @@ -642,7 +619,7 @@ dependencies = [ [[package]] name = "obce" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "ink", "ink_engine", @@ -654,18 +631,20 @@ dependencies = [ [[package]] name = "obce-codegen" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "blake2 0.10.4", + "itertools", "proc-macro2", "quote", "syn", + "tuple", ] [[package]] name = "obce-macro" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "obce-codegen", "proc-macro2", @@ -681,8 +660,8 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openbrush" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_contracts", @@ -693,8 +672,8 @@ dependencies = [ [[package]] name = "openbrush_contracts" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_lang", @@ -705,8 +684,8 @@ dependencies = [ [[package]] name = "openbrush_lang" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "const_format", "ink", @@ -718,15 +697,15 @@ dependencies = [ [[package]] name = "openbrush_lang_codegen" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "blake2 0.9.2", "cargo_metadata", "fs2", "heck 0.3.3", - "ink_ir 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", + "ink_ir", + "ink_primitives", "proc-macro2", "quote", "serde", @@ -738,8 +717,8 @@ dependencies = [ [[package]] name = "openbrush_lang_macro" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "openbrush_lang_codegen", "proc-macro2", @@ -750,7 +729,7 @@ dependencies = [ [[package]] name = "pallet-assets-chain-extension" version = "0.1.1" -source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?tag=3.0.0-beta#7e553468e9c0fbd4f543ccb950b3d17b548237f1" +source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?branch=polkadot-v0.9.37#f8ea374186df2a3fc139c8d585719e58d83df582" dependencies = [ "ink", "obce", @@ -904,18 +883,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550fc3b723a478be77bf74718947cdcdd75144d508aaa70f0a320036905df2a8" +checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8058e28ae464daf5ac14c5c0f78110b58616e796c4e4e28cfcca38fdb13d8f22" +checksum = "642a62736682fdd8c71da0eb273e453c8ac74e33b9fb310e22ba5b03ec7651ff" dependencies = [ "cc", ] @@ -1070,6 +1049,16 @@ dependencies = [ "serde", ] +[[package]] +name = "tuple" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a40ba241047e1174c927dc5f61c141a166b938d61a2ff61838441368cc7d0e" +dependencies = [ + "num-traits", + "serde", +] + [[package]] name = "typenum" version = "1.15.0" diff --git a/contracts/game_token/Cargo.toml b/contracts/game_token/Cargo.toml index 7555a656c7..37e4460438 100644 --- a/contracts/game_token/Cargo.toml +++ b/contracts/game_token/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" license = "Apache 2.0" [dependencies] -ink = { git = "https://github.com/paritytech/ink", rev = "4655a8b4413cb50cbc38d1b7c173ad426ab06cde", default-features = false} +ink = { version = "~4.0.0", default-features = false } +openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts/", tag = "3.0.0", default-features = false, features = ["psp22"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } -openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts.git", rev = "3.0.0-beta", default-features = false, features = ["psp22"] } access_control = { path = "../access_control", default-features = false, features = ["ink-as-dependency"] } [lib] diff --git a/contracts/marketplace/Cargo.lock b/contracts/marketplace/Cargo.lock index 23ca8455ca..e6fd4ebb4c 100644 --- a/contracts/marketplace/Cargo.lock +++ b/contracts/marketplace/Cargo.lock @@ -350,31 +350,34 @@ dependencies = [ [[package]] name = "ink" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc4ef9b97c97cf7444ff3931e8cc6287353b48595f7155f8f7c0e6b94b1225" dependencies = [ "derive_more", "ink_env", "ink_macro", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage", "parity-scale-codec", ] [[package]] name = "ink_allocator" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54dbbaffb0f97bcae062e628dcdc9da4d3c9044f5a53fb2715a328b07221631" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283b022679ef75898db5c28b89388412d93f91cea4f0b1443426901cb391b079" dependencies = [ "blake2 0.10.4", "derive_more", @@ -382,8 +385,8 @@ dependencies = [ "env_logger", "heck 0.4.0", "impl-serde", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "itertools", "log", "parity-scale-codec", @@ -396,12 +399,13 @@ dependencies = [ [[package]] name = "ink_engine" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daed9b710cba6f50f1fa0372a7e8a47a35624d84af4ef2c3a8d34d4e96202d1c" dependencies = [ "blake2 0.10.4", "derive_more", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_primitives", "parity-scale-codec", "secp256k1", "sha2", @@ -410,8 +414,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41c6a3f4e740e27449f805ed47f536a35fb254ebcd03d2480014589331cda3e" dependencies = [ "arrayref", "blake2 0.10.4", @@ -420,8 +425,8 @@ dependencies = [ "ink_allocator", "ink_engine", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "num-traits", "parity-scale-codec", @@ -436,22 +441,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf2ee9acbf86d5b2b6342266972217b61117c6468c81bdefe23e052beb05af1" -dependencies = [ - "blake2 0.10.4", - "either", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ink_ir" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "946b940d26e69ded558daafead0979f25f2e9d7e2cf86027f250c3942aa4d0f1" dependencies = [ "blake2 0.10.4", "either", @@ -463,12 +455,13 @@ dependencies = [ [[package]] name = "ink_macro" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6642450e6169cfaf81717b1d62b2abae48a6b41d3f70f885b6aeff7bb14ea96b" dependencies = [ "ink_codegen", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "parity-scale-codec", "proc-macro2", "quote", @@ -478,53 +471,35 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfcfa666ada5729c7e4d3d986cd196365a2c469459fced4fa31dc6ad87c4d8f" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "scale-info", "serde", ] [[package]] name = "ink_prelude" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5962125f78304bc2b3083391cbd579125c64ce17e61b019034094faf772c915a" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ink_prelude" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "f8080235e5ae921975c2c7772fe9959e1b3c92b4d5a1afcfe104f93fb79aa268" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f4f26208fe23e12d436917697b951252519484134a3561fe8b65a5abc97aa9" +checksum = "f1b3f711d857d2de7c08158369cc32a762833ac211a00aac7931992094e25741" dependencies = [ "derive_more", - "ink_prelude 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec", - "xxhash-rust", -] - -[[package]] -name = "ink_primitives" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" -dependencies = [ - "derive_more", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", "parity-scale-codec", "scale-info", "xxhash-rust", @@ -532,16 +507,17 @@ dependencies = [ [[package]] name = "ink_storage" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2872a5ea4559433381b2d82b08b6acd33ce934b07a22ce951c6f00483680c950" dependencies = [ "array-init", "cfg-if", "derive_more", "ink_env", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "parity-scale-codec", "scale-info", @@ -549,12 +525,13 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c90e11b60233ae5ab877854739da2c380a337cb31b3900cb50328821c0381b6" dependencies = [ "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "parity-scale-codec", "scale-info", "syn", @@ -655,7 +632,7 @@ dependencies = [ [[package]] name = "obce" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "ink", "ink_engine", @@ -667,18 +644,20 @@ dependencies = [ [[package]] name = "obce-codegen" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "blake2 0.10.4", + "itertools", "proc-macro2", "quote", "syn", + "tuple", ] [[package]] name = "obce-macro" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "obce-codegen", "proc-macro2", @@ -694,8 +673,8 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openbrush" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_contracts", @@ -706,8 +685,8 @@ dependencies = [ [[package]] name = "openbrush_contracts" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_lang", @@ -718,8 +697,8 @@ dependencies = [ [[package]] name = "openbrush_lang" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "const_format", "ink", @@ -731,15 +710,15 @@ dependencies = [ [[package]] name = "openbrush_lang_codegen" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "blake2 0.9.2", "cargo_metadata", "fs2", "heck 0.3.3", - "ink_ir 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", + "ink_ir", + "ink_primitives", "proc-macro2", "quote", "serde", @@ -751,8 +730,8 @@ dependencies = [ [[package]] name = "openbrush_lang_macro" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "openbrush_lang_codegen", "proc-macro2", @@ -763,7 +742,7 @@ dependencies = [ [[package]] name = "pallet-assets-chain-extension" version = "0.1.1" -source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?tag=3.0.0-beta#7e553468e9c0fbd4f543ccb950b3d17b548237f1" +source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?branch=polkadot-v0.9.37#f8ea374186df2a3fc139c8d585719e58d83df582" dependencies = [ "ink", "obce", @@ -917,18 +896,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550fc3b723a478be77bf74718947cdcdd75144d508aaa70f0a320036905df2a8" +checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8058e28ae464daf5ac14c5c0f78110b58616e796c4e4e28cfcca38fdb13d8f22" +checksum = "642a62736682fdd8c71da0eb273e453c8ac74e33b9fb310e22ba5b03ec7651ff" dependencies = [ "cc", ] @@ -1094,6 +1073,16 @@ dependencies = [ "serde", ] +[[package]] +name = "tuple" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a40ba241047e1174c927dc5f61c141a166b938d61a2ff61838441368cc7d0e" +dependencies = [ + "num-traits", + "serde", +] + [[package]] name = "typenum" version = "1.15.0" diff --git a/contracts/marketplace/Cargo.toml b/contracts/marketplace/Cargo.toml index 97d96fc6b8..f04088a247 100644 --- a/contracts/marketplace/Cargo.toml +++ b/contracts/marketplace/Cargo.toml @@ -6,13 +6,12 @@ edition = "2021" license = "Apache 2.0" [dependencies] -ink = { git = "https://github.com/paritytech/ink", rev = "4655a8b4413cb50cbc38d1b7c173ad426ab06cde", default-features = false} +ink = { version = "~4.0.0", default-features = false } +openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts/", tag = "3.0.0", default-features = false, features = ["psp22"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } -openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts.git", rev = "3.0.0-beta", default-features = false, features = ["psp22"] } - access_control = { path = "../access_control", default-features = false, features = ["ink-as-dependency"] } game_token = { path = "../game_token", default-features = false, features = ["ink-as-dependency"] } ticket_token = { path = "../ticket_token", default-features = false, features = ["ink-as-dependency"] } diff --git a/contracts/marketplace/lib.rs b/contracts/marketplace/lib.rs index 48038531da..c71483b0bd 100644 --- a/contracts/marketplace/lib.rs +++ b/contracts/marketplace/lib.rs @@ -268,7 +268,7 @@ pub mod marketplace { fn take_payment(&self, from: AccountId, amount: Balance) -> Result<(), Error> { PSP22BurnableRef::burn_builder(&self.reward_token, from, amount) .call_flags(ink::env::CallFlags::default().set_allow_reentry(true)) - .fire()???; + .invoke()?; Ok(()) } diff --git a/contracts/simple_dex/Cargo.lock b/contracts/simple_dex/Cargo.lock index 20779f141d..eee0c076ed 100644 --- a/contracts/simple_dex/Cargo.lock +++ b/contracts/simple_dex/Cargo.lock @@ -397,31 +397,34 @@ dependencies = [ [[package]] name = "ink" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc4ef9b97c97cf7444ff3931e8cc6287353b48595f7155f8f7c0e6b94b1225" dependencies = [ "derive_more", "ink_env", "ink_macro", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage", "parity-scale-codec", ] [[package]] name = "ink_allocator" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54dbbaffb0f97bcae062e628dcdc9da4d3c9044f5a53fb2715a328b07221631" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283b022679ef75898db5c28b89388412d93f91cea4f0b1443426901cb391b079" dependencies = [ "blake2 0.10.4", "derive_more", @@ -429,8 +432,8 @@ dependencies = [ "env_logger", "heck 0.4.0", "impl-serde", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "itertools", "log", "parity-scale-codec", @@ -443,12 +446,13 @@ dependencies = [ [[package]] name = "ink_engine" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daed9b710cba6f50f1fa0372a7e8a47a35624d84af4ef2c3a8d34d4e96202d1c" dependencies = [ "blake2 0.10.4", "derive_more", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_primitives", "parity-scale-codec", "secp256k1", "sha2", @@ -457,8 +461,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41c6a3f4e740e27449f805ed47f536a35fb254ebcd03d2480014589331cda3e" dependencies = [ "arrayref", "blake2 0.10.4", @@ -467,8 +472,8 @@ dependencies = [ "ink_allocator", "ink_engine", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "num-traits", "parity-scale-codec", @@ -483,22 +488,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf2ee9acbf86d5b2b6342266972217b61117c6468c81bdefe23e052beb05af1" -dependencies = [ - "blake2 0.10.4", - "either", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ink_ir" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "946b940d26e69ded558daafead0979f25f2e9d7e2cf86027f250c3942aa4d0f1" dependencies = [ "blake2 0.10.4", "either", @@ -510,12 +502,13 @@ dependencies = [ [[package]] name = "ink_macro" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6642450e6169cfaf81717b1d62b2abae48a6b41d3f70f885b6aeff7bb14ea96b" dependencies = [ "ink_codegen", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "parity-scale-codec", "proc-macro2", "quote", @@ -525,53 +518,35 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfcfa666ada5729c7e4d3d986cd196365a2c469459fced4fa31dc6ad87c4d8f" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "scale-info", "serde", ] [[package]] name = "ink_prelude" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5962125f78304bc2b3083391cbd579125c64ce17e61b019034094faf772c915a" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ink_prelude" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "f8080235e5ae921975c2c7772fe9959e1b3c92b4d5a1afcfe104f93fb79aa268" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f4f26208fe23e12d436917697b951252519484134a3561fe8b65a5abc97aa9" +checksum = "f1b3f711d857d2de7c08158369cc32a762833ac211a00aac7931992094e25741" dependencies = [ "derive_more", - "ink_prelude 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec", - "xxhash-rust", -] - -[[package]] -name = "ink_primitives" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" -dependencies = [ - "derive_more", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", "parity-scale-codec", "scale-info", "xxhash-rust", @@ -579,16 +554,17 @@ dependencies = [ [[package]] name = "ink_storage" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2872a5ea4559433381b2d82b08b6acd33ce934b07a22ce951c6f00483680c950" dependencies = [ "array-init", "cfg-if", "derive_more", "ink_env", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "parity-scale-codec", "scale-info", @@ -596,12 +572,13 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c90e11b60233ae5ab877854739da2c380a337cb31b3900cb50328821c0381b6" dependencies = [ "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "parity-scale-codec", "scale-info", "syn", @@ -704,7 +681,7 @@ dependencies = [ [[package]] name = "obce" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "ink", "ink_engine", @@ -716,18 +693,20 @@ dependencies = [ [[package]] name = "obce-codegen" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "blake2 0.10.4", + "itertools", "proc-macro2", "quote", "syn", + "tuple", ] [[package]] name = "obce-macro" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "obce-codegen", "proc-macro2", @@ -749,8 +728,8 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openbrush" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_contracts", @@ -761,8 +740,8 @@ dependencies = [ [[package]] name = "openbrush_contracts" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_lang", @@ -773,8 +752,8 @@ dependencies = [ [[package]] name = "openbrush_lang" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "const_format", "ink", @@ -786,15 +765,15 @@ dependencies = [ [[package]] name = "openbrush_lang_codegen" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "blake2 0.9.2", "cargo_metadata", "fs2", "heck 0.3.3", - "ink_ir 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", + "ink_ir", + "ink_primitives", "proc-macro2", "quote", "serde", @@ -806,8 +785,8 @@ dependencies = [ [[package]] name = "openbrush_lang_macro" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "openbrush_lang_codegen", "proc-macro2", @@ -818,7 +797,7 @@ dependencies = [ [[package]] name = "pallet-assets-chain-extension" version = "0.1.1" -source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?tag=3.0.0-beta#7e553468e9c0fbd4f543ccb950b3d17b548237f1" +source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?branch=polkadot-v0.9.37#f8ea374186df2a3fc139c8d585719e58d83df582" dependencies = [ "ink", "obce", @@ -1081,18 +1060,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550fc3b723a478be77bf74718947cdcdd75144d508aaa70f0a320036905df2a8" +checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8058e28ae464daf5ac14c5c0f78110b58616e796c4e4e28cfcca38fdb13d8f22" +checksum = "642a62736682fdd8c71da0eb273e453c8ac74e33b9fb310e22ba5b03ec7651ff" dependencies = [ "cc", ] @@ -1274,6 +1253,16 @@ dependencies = [ "serde", ] +[[package]] +name = "tuple" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a40ba241047e1174c927dc5f61c141a166b938d61a2ff61838441368cc7d0e" +dependencies = [ + "num-traits", + "serde", +] + [[package]] name = "typenum" version = "1.15.0" diff --git a/contracts/simple_dex/Cargo.toml b/contracts/simple_dex/Cargo.toml index 8abc3a0098..79237fa3d8 100644 --- a/contracts/simple_dex/Cargo.toml +++ b/contracts/simple_dex/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" license = "Apache 2.0" [dependencies] -ink = { git = "https://github.com/paritytech/ink", rev = "4655a8b4413cb50cbc38d1b7c173ad426ab06cde", default-features = false} +ink = { version = "~4.0.0", default-features = false } +openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts/", tag = "3.0.0", default-features = false, features = ["psp22"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } -openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts.git", rev = "3.0.0-beta", default-features = false, features = ["psp22"] } access_control = { path = "../access_control", default-features = false, features = ["ink-as-dependency"] } game_token = { path = "../game_token", default-features = false, features = ["ink-as-dependency"] } diff --git a/contracts/simple_dex/lib.rs b/contracts/simple_dex/lib.rs index f774b7bbd9..9878276126 100644 --- a/contracts/simple_dex/lib.rs +++ b/contracts/simple_dex/lib.rs @@ -457,7 +457,7 @@ mod simple_dex { ) -> Result<(), DexError> { PSP22Ref::transfer_from_builder(&token, from, to, amount, vec![0x0]) .call_flags(CallFlags::default().set_allow_reentry(true)) - .fire()???; + .invoke()?; Ok(()) } diff --git a/contracts/ticket_token/Cargo.lock b/contracts/ticket_token/Cargo.lock index 5690c9f6df..7f7831f838 100644 --- a/contracts/ticket_token/Cargo.lock +++ b/contracts/ticket_token/Cargo.lock @@ -339,31 +339,34 @@ dependencies = [ [[package]] name = "ink" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc4ef9b97c97cf7444ff3931e8cc6287353b48595f7155f8f7c0e6b94b1225" dependencies = [ "derive_more", "ink_env", "ink_macro", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage", "parity-scale-codec", ] [[package]] name = "ink_allocator" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54dbbaffb0f97bcae062e628dcdc9da4d3c9044f5a53fb2715a328b07221631" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283b022679ef75898db5c28b89388412d93f91cea4f0b1443426901cb391b079" dependencies = [ "blake2 0.10.4", "derive_more", @@ -371,8 +374,8 @@ dependencies = [ "env_logger", "heck 0.4.0", "impl-serde", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "itertools", "log", "parity-scale-codec", @@ -385,12 +388,13 @@ dependencies = [ [[package]] name = "ink_engine" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daed9b710cba6f50f1fa0372a7e8a47a35624d84af4ef2c3a8d34d4e96202d1c" dependencies = [ "blake2 0.10.4", "derive_more", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_primitives", "parity-scale-codec", "secp256k1", "sha2", @@ -399,8 +403,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41c6a3f4e740e27449f805ed47f536a35fb254ebcd03d2480014589331cda3e" dependencies = [ "arrayref", "blake2 0.10.4", @@ -409,8 +414,8 @@ dependencies = [ "ink_allocator", "ink_engine", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "num-traits", "parity-scale-codec", @@ -425,22 +430,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf2ee9acbf86d5b2b6342266972217b61117c6468c81bdefe23e052beb05af1" -dependencies = [ - "blake2 0.10.4", - "either", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ink_ir" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "946b940d26e69ded558daafead0979f25f2e9d7e2cf86027f250c3942aa4d0f1" dependencies = [ "blake2 0.10.4", "either", @@ -452,12 +444,13 @@ dependencies = [ [[package]] name = "ink_macro" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6642450e6169cfaf81717b1d62b2abae48a6b41d3f70f885b6aeff7bb14ea96b" dependencies = [ "ink_codegen", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "parity-scale-codec", "proc-macro2", "quote", @@ -467,53 +460,35 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfcfa666ada5729c7e4d3d986cd196365a2c469459fced4fa31dc6ad87c4d8f" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "scale-info", "serde", ] [[package]] name = "ink_prelude" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5962125f78304bc2b3083391cbd579125c64ce17e61b019034094faf772c915a" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ink_prelude" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "f8080235e5ae921975c2c7772fe9959e1b3c92b4d5a1afcfe104f93fb79aa268" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f4f26208fe23e12d436917697b951252519484134a3561fe8b65a5abc97aa9" +checksum = "f1b3f711d857d2de7c08158369cc32a762833ac211a00aac7931992094e25741" dependencies = [ "derive_more", - "ink_prelude 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec", - "xxhash-rust", -] - -[[package]] -name = "ink_primitives" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" -dependencies = [ - "derive_more", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", "parity-scale-codec", "scale-info", "xxhash-rust", @@ -521,16 +496,17 @@ dependencies = [ [[package]] name = "ink_storage" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2872a5ea4559433381b2d82b08b6acd33ce934b07a22ce951c6f00483680c950" dependencies = [ "array-init", "cfg-if", "derive_more", "ink_env", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "parity-scale-codec", "scale-info", @@ -538,12 +514,13 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c90e11b60233ae5ab877854739da2c380a337cb31b3900cb50328821c0381b6" dependencies = [ "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "parity-scale-codec", "scale-info", "syn", @@ -631,7 +608,7 @@ dependencies = [ [[package]] name = "obce" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "ink", "ink_engine", @@ -643,18 +620,20 @@ dependencies = [ [[package]] name = "obce-codegen" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "blake2 0.10.4", + "itertools", "proc-macro2", "quote", "syn", + "tuple", ] [[package]] name = "obce-macro" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "obce-codegen", "proc-macro2", @@ -676,8 +655,8 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openbrush" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_contracts", @@ -688,8 +667,8 @@ dependencies = [ [[package]] name = "openbrush_contracts" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_lang", @@ -700,8 +679,8 @@ dependencies = [ [[package]] name = "openbrush_lang" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "const_format", "ink", @@ -713,15 +692,15 @@ dependencies = [ [[package]] name = "openbrush_lang_codegen" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "blake2 0.9.2", "cargo_metadata", "fs2", "heck 0.3.3", - "ink_ir 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", + "ink_ir", + "ink_primitives", "proc-macro2", "quote", "serde", @@ -733,8 +712,8 @@ dependencies = [ [[package]] name = "openbrush_lang_macro" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "openbrush_lang_codegen", "proc-macro2", @@ -745,7 +724,7 @@ dependencies = [ [[package]] name = "pallet-assets-chain-extension" version = "0.1.1" -source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?tag=3.0.0-beta#7e553468e9c0fbd4f543ccb950b3d17b548237f1" +source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?branch=polkadot-v0.9.37#f8ea374186df2a3fc139c8d585719e58d83df582" dependencies = [ "ink", "obce", @@ -901,18 +880,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550fc3b723a478be77bf74718947cdcdd75144d508aaa70f0a320036905df2a8" +checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8058e28ae464daf5ac14c5c0f78110b58616e796c4e4e28cfcca38fdb13d8f22" +checksum = "642a62736682fdd8c71da0eb273e453c8ac74e33b9fb310e22ba5b03ec7651ff" dependencies = [ "cc", ] @@ -1078,6 +1057,16 @@ dependencies = [ "serde", ] +[[package]] +name = "tuple" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a40ba241047e1174c927dc5f61c141a166b938d61a2ff61838441368cc7d0e" +dependencies = [ + "num-traits", + "serde", +] + [[package]] name = "typenum" version = "1.15.0" diff --git a/contracts/ticket_token/Cargo.toml b/contracts/ticket_token/Cargo.toml index 53fde6ec00..48c9c486ef 100644 --- a/contracts/ticket_token/Cargo.toml +++ b/contracts/ticket_token/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" license = "Apache 2.0" [dependencies] -ink = { git = "https://github.com/paritytech/ink", rev = "4655a8b4413cb50cbc38d1b7c173ad426ab06cde", default-features = false} +ink = { version = "~4.0.0", default-features = false } +openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts/", tag = "3.0.0", default-features = false, features = ["psp22"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } -openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts.git", rev = "3.0.0-beta", default-features = false, features = ["psp22"] } access_control = { path = "../access_control", default-features = false, features = ["ink-as-dependency"] } [lib] diff --git a/contracts/wrapped_azero/Cargo.lock b/contracts/wrapped_azero/Cargo.lock index a5a01058dd..00ddff7d77 100644 --- a/contracts/wrapped_azero/Cargo.lock +++ b/contracts/wrapped_azero/Cargo.lock @@ -339,31 +339,34 @@ dependencies = [ [[package]] name = "ink" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc4ef9b97c97cf7444ff3931e8cc6287353b48595f7155f8f7c0e6b94b1225" dependencies = [ "derive_more", "ink_env", "ink_macro", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage", "parity-scale-codec", ] [[package]] name = "ink_allocator" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54dbbaffb0f97bcae062e628dcdc9da4d3c9044f5a53fb2715a328b07221631" dependencies = [ "cfg-if", ] [[package]] name = "ink_codegen" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "283b022679ef75898db5c28b89388412d93f91cea4f0b1443426901cb391b079" dependencies = [ "blake2 0.10.4", "derive_more", @@ -371,8 +374,8 @@ dependencies = [ "env_logger", "heck 0.4.0", "impl-serde", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "itertools", "log", "parity-scale-codec", @@ -385,12 +388,13 @@ dependencies = [ [[package]] name = "ink_engine" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daed9b710cba6f50f1fa0372a7e8a47a35624d84af4ef2c3a8d34d4e96202d1c" dependencies = [ "blake2 0.10.4", "derive_more", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_primitives", "parity-scale-codec", "secp256k1", "sha2", @@ -399,8 +403,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41c6a3f4e740e27449f805ed47f536a35fb254ebcd03d2480014589331cda3e" dependencies = [ "arrayref", "blake2 0.10.4", @@ -409,8 +414,8 @@ dependencies = [ "ink_allocator", "ink_engine", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "num-traits", "parity-scale-codec", @@ -425,22 +430,9 @@ dependencies = [ [[package]] name = "ink_ir" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf2ee9acbf86d5b2b6342266972217b61117c6468c81bdefe23e052beb05af1" -dependencies = [ - "blake2 0.10.4", - "either", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ink_ir" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "946b940d26e69ded558daafead0979f25f2e9d7e2cf86027f250c3942aa4d0f1" dependencies = [ "blake2 0.10.4", "either", @@ -452,12 +444,13 @@ dependencies = [ [[package]] name = "ink_macro" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6642450e6169cfaf81717b1d62b2abae48a6b41d3f70f885b6aeff7bb14ea96b" dependencies = [ "ink_codegen", - "ink_ir 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_ir", + "ink_primitives", "parity-scale-codec", "proc-macro2", "quote", @@ -467,53 +460,35 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfcfa666ada5729c7e4d3d986cd196365a2c469459fced4fa31dc6ad87c4d8f" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "scale-info", "serde", ] [[package]] name = "ink_prelude" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5962125f78304bc2b3083391cbd579125c64ce17e61b019034094faf772c915a" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ink_prelude" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +checksum = "f8080235e5ae921975c2c7772fe9959e1b3c92b4d5a1afcfe104f93fb79aa268" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0-beta" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f4f26208fe23e12d436917697b951252519484134a3561fe8b65a5abc97aa9" +checksum = "f1b3f711d857d2de7c08158369cc32a762833ac211a00aac7931992094e25741" dependencies = [ "derive_more", - "ink_prelude 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec", - "xxhash-rust", -] - -[[package]] -name = "ink_primitives" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" -dependencies = [ - "derive_more", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", "parity-scale-codec", "scale-info", "xxhash-rust", @@ -521,16 +496,17 @@ dependencies = [ [[package]] name = "ink_storage" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2872a5ea4559433381b2d82b08b6acd33ce934b07a22ce951c6f00483680c950" dependencies = [ "array-init", "cfg-if", "derive_more", "ink_env", "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "ink_storage_traits", "parity-scale-codec", "scale-info", @@ -538,12 +514,13 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0-beta" -source = "git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde#4655a8b4413cb50cbc38d1b7c173ad426ab06cde" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c90e11b60233ae5ab877854739da2c380a337cb31b3900cb50328821c0381b6" dependencies = [ "ink_metadata", - "ink_prelude 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", - "ink_primitives 4.0.0-beta (git+https://github.com/paritytech/ink?rev=4655a8b4413cb50cbc38d1b7c173ad426ab06cde)", + "ink_prelude", + "ink_primitives", "parity-scale-codec", "scale-info", "syn", @@ -631,7 +608,7 @@ dependencies = [ [[package]] name = "obce" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "ink", "ink_engine", @@ -643,18 +620,20 @@ dependencies = [ [[package]] name = "obce-codegen" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "blake2 0.10.4", + "itertools", "proc-macro2", "quote", "syn", + "tuple", ] [[package]] name = "obce-macro" version = "0.1.0" -source = "git+https://github.com/727-Ventures/obce?tag=3.0.0-beta#e4d93be5ea31ea39fd5c692e93ebe319b51cd604" +source = "git+https://github.com/727-Ventures/obce?branch=polkadot-v0.9.37#d452f6eda1bc1ecb36e7e332d61529ad440d5a89" dependencies = [ "obce-codegen", "proc-macro2", @@ -676,8 +655,8 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openbrush" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_contracts", @@ -688,8 +667,8 @@ dependencies = [ [[package]] name = "openbrush_contracts" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "ink", "openbrush_lang", @@ -700,8 +679,8 @@ dependencies = [ [[package]] name = "openbrush_lang" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "const_format", "ink", @@ -713,15 +692,15 @@ dependencies = [ [[package]] name = "openbrush_lang_codegen" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "blake2 0.9.2", "cargo_metadata", "fs2", "heck 0.3.3", - "ink_ir 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 4.0.0-beta (registry+https://github.com/rust-lang/crates.io-index)", + "ink_ir", + "ink_primitives", "proc-macro2", "quote", "serde", @@ -733,8 +712,8 @@ dependencies = [ [[package]] name = "openbrush_lang_macro" -version = "3.0.0-beta" -source = "git+https://github.com/727-Ventures/openbrush-contracts.git?rev=3.0.0-beta#14ff655a0d83440f40c57c82d9a33e4c5b981da7" +version = "3.0.0" +source = "git+https://github.com/727-Ventures/openbrush-contracts/?tag=3.0.0#9894c2fda2f7b59959a7184c047e8e08aa45ffc2" dependencies = [ "openbrush_lang_codegen", "proc-macro2", @@ -745,7 +724,7 @@ dependencies = [ [[package]] name = "pallet-assets-chain-extension" version = "0.1.1" -source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?tag=3.0.0-beta#7e553468e9c0fbd4f543ccb950b3d17b548237f1" +source = "git+https://github.com/727-ventures/pallet-assets-chain-extension?branch=polkadot-v0.9.37#f8ea374186df2a3fc139c8d585719e58d83df582" dependencies = [ "ink", "obce", @@ -901,18 +880,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550fc3b723a478be77bf74718947cdcdd75144d508aaa70f0a320036905df2a8" +checksum = "4124a35fe33ae14259c490fd70fa199a32b9ce9502f2ee6bc4f81ec06fa65894" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8058e28ae464daf5ac14c5c0f78110b58616e796c4e4e28cfcca38fdb13d8f22" +checksum = "642a62736682fdd8c71da0eb273e453c8ac74e33b9fb310e22ba5b03ec7651ff" dependencies = [ "cc", ] @@ -1067,6 +1046,16 @@ dependencies = [ "serde", ] +[[package]] +name = "tuple" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a40ba241047e1174c927dc5f61c141a166b938d61a2ff61838441368cc7d0e" +dependencies = [ + "num-traits", + "serde", +] + [[package]] name = "typenum" version = "1.15.0" diff --git a/contracts/wrapped_azero/Cargo.toml b/contracts/wrapped_azero/Cargo.toml index 14638f56fc..9f7073fe21 100644 --- a/contracts/wrapped_azero/Cargo.toml +++ b/contracts/wrapped_azero/Cargo.toml @@ -6,13 +6,12 @@ edition = "2021" license = "Apache 2.0" [dependencies] -ink = { git = "https://github.com/paritytech/ink", rev = "4655a8b4413cb50cbc38d1b7c173ad426ab06cde", default-features = false} +ink = { version = "~4.0.0", default-features = false } +openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts/", tag = "3.0.0", default-features = false, features = ["psp22"] } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true } -openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts.git", rev = "3.0.0-beta", default-features = false, features = ["psp22"] } - num-traits = { version = "0.2", default-features = false } access_control = { path = "../access_control", default-features = false, features = ["ink-as-dependency"] } From 3cf1851741b1c3a856d797469821998ee07674d1 Mon Sep 17 00:00:00 2001 From: deuszx Date: Wed, 8 Mar 2023 12:12:03 +0100 Subject: [PATCH 2/2] Minimize dependencies --- aleph-client/Cargo.lock | 608 +++++++++++++++----------- aleph-client/Cargo.toml | 4 +- bin/cliain/Cargo.lock | 824 ++++++++++++++++++------------------ bin/cliain/Cargo.toml | 5 +- bin/cliain/src/contracts.rs | 11 +- 5 files changed, 782 insertions(+), 670 deletions(-) diff --git a/aleph-client/Cargo.lock b/aleph-client/Cargo.lock index bec58962ad..337894ee65 100644 --- a/aleph-client/Cargo.lock +++ b/aleph-client/Cargo.lock @@ -74,12 +74,10 @@ version = "2.13.0" dependencies = [ "anyhow", "async-trait", - "contract-metadata 2.0.1", "contract-transcode", "frame-support", "futures", "hex", - "ink_metadata", "log", "pallet-contracts-primitives", "parity-scale-codec", @@ -296,6 +294,18 @@ dependencies = [ "byte-tools", ] +[[package]] +name = "bounded-collections" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a071c348a5ef6da1d3a87166b408170b46002382b1dda83992b5c2208cefb370" +dependencies = [ + "log", + "parity-scale-codec", + "scale-info", + "serde", +] + [[package]] name = "brownstone" version = "1.1.0" @@ -386,22 +396,9 @@ checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" [[package]] name = "contract-metadata" -version = "2.0.0-beta.1" -source = "git+https://github.com/paritytech/cargo-contract?rev=7ca8c365fc1e157cd52901c54949b2faf1cd8899#7ca8c365fc1e157cd52901c54949b2faf1cd8899" -dependencies = [ - "anyhow", - "impl-serde", - "semver", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "contract-metadata" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5997814dd5d45804757a616e938c28586875ac793ffc140e57e7ae9f421a066" +checksum = "9799ec9b939a0f54b4a043f821823135bae09ee337014b34392805cfcb8585bc" dependencies = [ "anyhow", "impl-serde", @@ -413,11 +410,12 @@ dependencies = [ [[package]] name = "contract-transcode" -version = "2.0.0-beta.1" -source = "git+https://github.com/paritytech/cargo-contract?rev=7ca8c365fc1e157cd52901c54949b2faf1cd8899#7ca8c365fc1e157cd52901c54949b2faf1cd8899" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16783701c3f24f1e30ec3236ddade800b445e7bab6c3da354f33fe4b980bccd" dependencies = [ "anyhow", - "contract-metadata 2.0.0-beta.1", + "contract-metadata", "escape8259", "hex", "indexmap", @@ -430,8 +428,8 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 16.0.0", + "sp-runtime 18.0.0", "tracing", ] @@ -478,6 +476,15 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.92.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dab984c94593f876090fae92e984bdcc74d9b1acf740ab5f79036001c65cba13" +dependencies = [ + "serde", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -946,14 +953,14 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-api", "sp-arithmetic 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-core-hashing-proc-macro", "sp-inherents", "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-staking 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-staking", "sp-state-machine 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-tracing 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", @@ -1459,18 +1466,18 @@ dependencies = [ [[package]] name = "ink_allocator" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5323d4f43900266f2d5462cbe2a96d4182d634da0cfc1078d26c74d4117e0ce9" +checksum = "a54dbbaffb0f97bcae062e628dcdc9da4d3c9044f5a53fb2715a328b07221631" dependencies = [ "cfg-if", ] [[package]] name = "ink_engine" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de001b0907475ab10211093569d8b92726ef7a37d04b6e90c8a2864fbe14d050" +checksum = "daed9b710cba6f50f1fa0372a7e8a47a35624d84af4ef2c3a8d34d4e96202d1c" dependencies = [ "blake2", "derive_more", @@ -1483,9 +1490,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0354567725e4f635a5c5694e4e4cac105e3e78cefd948ca5ab6cc92ea3d8231" +checksum = "a41c6a3f4e740e27449f805ed47f536a35fb254ebcd03d2480014589331cda3e" dependencies = [ "arrayref", "blake2", @@ -1510,9 +1517,9 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfb4d5448446656ebf83d800c06effeffc063967ef5986d7d1a277e3e507dae" +checksum = "5dfcfa666ada5729c7e4d3d986cd196365a2c469459fced4fa31dc6ad87c4d8f" dependencies = [ "derive_more", "impl-serde", @@ -1524,18 +1531,18 @@ dependencies = [ [[package]] name = "ink_prelude" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2626fb0c922f923965774cdd8cddeaaa204931d0ed19e0bf43702b033924173" +checksum = "f8080235e5ae921975c2c7772fe9959e1b3c92b4d5a1afcfe104f93fb79aa268" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91066af898fe4c59b2ed0aca678238928b551dc75f5284bf1422e9f1bb6b2204" +checksum = "f1b3f711d857d2de7c08158369cc32a762833ac211a00aac7931992094e25741" dependencies = [ "derive_more", "ink_prelude", @@ -1546,9 +1553,9 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da15ceaef6bdbece3e8b6338df899ef94e3921d03387fa941af8df3b38803523" +checksum = "8c90e11b60233ae5ab877854739da2c380a337cb31b3900cb50328821c0381b6" dependencies = [ "ink_metadata", "ink_prelude", @@ -1582,6 +1589,16 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +[[package]] +name = "io-lifetimes" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -1803,6 +1820,12 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.4.9" @@ -1855,6 +1878,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" +dependencies = [ + "rustix 0.36.9", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -2282,12 +2314,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-application-crypto 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-staking 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-api", + "sp-application-crypto 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-staking", + "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", ] [[package]] @@ -2551,12 +2583,26 @@ checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.7.5", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.46", "windows-sys 0.42.0", ] +[[package]] +name = "rustix" +version = "0.36.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.6", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + [[package]] name = "rustls" version = "0.20.8" @@ -2592,9 +2638,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" @@ -2976,31 +3022,13 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-api-proc-macro", "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-state-machine 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-trie 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-version 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "thiserror", -] - -[[package]] -name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-state-machine 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-trie 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-version 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-version", "thiserror", ] @@ -3016,18 +3044,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "blake2", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-application-crypto" version = "7.0.0" @@ -3057,15 +3073,16 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f08604ba4bd856311946722958711a08bded5c929e1227f7a697c58deb09468" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-io 17.0.0", + "sp-std 6.0.0", ] [[package]] @@ -3100,15 +3117,16 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7796939f2e3b68a3b9410ea17a2063b78038cd366f57fa772dd3be0798bd3412" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", "static_assertions", ] @@ -3202,13 +3220,15 @@ dependencies = [ [[package]] name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c96dc3debbe5c22ebf18f99e6a53199efe748e6e584a1902adb88cbad66ae7c" dependencies = [ "array-bytes", "base58", "bitflags", "blake2", + "bounded-collections", "dyn-clonable", "ed25519-zebra", "futures", @@ -3229,12 +3249,12 @@ dependencies = [ "secp256k1 0.24.3", "secrecy", "serde", - "sp-core-hashing 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-debug-derive 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime-interface 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-storage 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core-hashing 6.0.0", + "sp-debug-derive 6.0.0", + "sp-externalities 0.17.0", + "sp-runtime-interface 13.0.0", + "sp-std 6.0.0", + "sp-storage 11.0.0", "ss58-registry", "substrate-bip39", "thiserror", @@ -3273,15 +3293,16 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc2d1947252b7a4e403b0a260f596920443742791765ec111daa2bbf98eff25" dependencies = [ "blake2", "byteorder", "digest 0.10.6", "sha2 0.10.6", "sha3", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", "twox-hash", ] @@ -3296,17 +3317,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "syn", -] - [[package]] name = "sp-debug-derive" version = "5.0.0" @@ -3330,8 +3340,9 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fb9dc63d54de7d7bed62a505b6e0bd66c122525ea1abb348f6564717c3df2d" dependencies = [ "proc-macro2", "quote", @@ -3363,13 +3374,14 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57052935c9c9b070ea6b339ef0da3bf241b7e065fc37f9c551669ee83ecfc3c1" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-storage 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", + "sp-storage 11.0.0", ] [[package]] @@ -3440,8 +3452,9 @@ dependencies = [ [[package]] name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578959f9a7e44fd2dd96e8b8bc893cea04fcd7c00a4ffbb0b91c5013899dd02b" dependencies = [ "bytes", "ed25519", @@ -3451,14 +3464,14 @@ dependencies = [ "log", "parity-scale-codec", "secp256k1 0.24.3", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-keystore 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime-interface 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-state-machine 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-tracing 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-trie 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-externalities 0.17.0", + "sp-keystore 0.22.0", + "sp-runtime-interface 13.0.0", + "sp-state-machine 0.22.0", + "sp-std 6.0.0", + "sp-tracing 8.0.0", + "sp-trie 16.0.0", "tracing", "tracing-core", ] @@ -3498,8 +3511,9 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480dbd54b281c638209fbcfce69902b82a0a1af0e22219d46825eadced3136b6" dependencies = [ "async-trait", "futures", @@ -3507,8 +3521,8 @@ dependencies = [ "parity-scale-codec", "parking_lot", "schnorrkel", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-externalities 0.17.0", "thiserror", ] @@ -3535,8 +3549,9 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4abed79c3d5b3622f65ab065676addd9923b9b122cd257df23e2757ce487c6d2" dependencies = [ "backtrace", "lazy_static", @@ -3591,8 +3606,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8ab2fd44668d3e8674e2253a43852857a47d49be7db737e98bf157e4bcebefd" dependencies = [ "either", "hash256-std-hasher", @@ -3603,12 +3619,12 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-arithmetic 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-weights 4.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-application-crypto 17.0.0", + "sp-arithmetic 12.0.0", + "sp-core 16.0.0", + "sp-io 17.0.0", + "sp-std 6.0.0", + "sp-weights 14.0.0", ] [[package]] @@ -3650,19 +3666,20 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb7707246cee4967a8cc71e3ef0e82f562e8b1020606447a6a12b99c7c1b443" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime-interface-proc-macro 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-storage 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-tracing 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-wasm-interface 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-externalities 0.17.0", + "sp-runtime-interface-proc-macro 9.0.0", + "sp-std 6.0.0", + "sp-storage 11.0.0", + "sp-tracing 8.0.0", + "sp-wasm-interface 10.0.0", "static_assertions", ] @@ -3693,8 +3710,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2773c90e5765847c5e8b4a24b553d38a9ca52ded47c142cfcfb7948f42827af9" dependencies = [ "Inflector", "proc-macro-crate", @@ -3715,18 +3733,6 @@ dependencies = [ "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", ] -[[package]] -name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", -] - [[package]] name = "sp-state-machine" version = "0.13.0" @@ -3772,8 +3778,9 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c957b8b4c252507c12674948db427c5e34fd1760ce256922f1ec5f89f781a4f" dependencies = [ "hash-db", "log", @@ -3781,11 +3788,11 @@ dependencies = [ "parking_lot", "rand 0.8.5", "smallvec", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-panic-handler 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-trie 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-externalities 0.17.0", + "sp-panic-handler 6.0.0", + "sp-std 6.0.0", + "sp-trie 16.0.0", "thiserror", "tracing", ] @@ -3803,8 +3810,9 @@ source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=alep [[package]] name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e" [[package]] name = "sp-storage" @@ -3835,15 +3843,16 @@ dependencies = [ [[package]] name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c20cb0c562d1a159ecb2c7ca786828c81e432c535474967d2df3a484977cea4" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-debug-derive 6.0.0", + "sp-std 6.0.0", ] [[package]] @@ -3873,11 +3882,12 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46bd547da89a9cda69b4ce4c91a5b7e1f86915190d83cd407b715d0c6bac042" dependencies = [ "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", "tracing", "tracing-core", "tracing-subscriber", @@ -3932,8 +3942,9 @@ dependencies = [ [[package]] name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8efbe5b6d29a18fea7c2f52e0098135f2f864b31d335d5105b40a349866ba874" dependencies = [ "ahash 0.8.3", "hash-db", @@ -3945,8 +3956,8 @@ dependencies = [ "parking_lot", "scale-info", "schnellru", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-std 6.0.0", "thiserror", "tracing", "trie-db", @@ -3963,27 +3974,10 @@ dependencies = [ "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-core-hashing-proc-macro", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "thiserror", -] - -[[package]] -name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm", - "scale-info", - "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-version-proc-macro", "thiserror", ] @@ -3998,17 +3992,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "parity-scale-codec", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-wasm-interface" version = "7.0.0" @@ -4032,20 +4015,22 @@ dependencies = [ "parity-scale-codec", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "wasmi", - "wasmtime", + "wasmtime 1.0.2", ] [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbc05650b6338808892a7b04f0c56bb1f7f928bfa9ac58e0af2c1e5bef33229" dependencies = [ + "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", "wasmi", - "wasmtime", + "wasmtime 5.0.0", ] [[package]] @@ -4082,17 +4067,18 @@ dependencies = [ [[package]] name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ebab7696f915aa548494aef3ca8d15217baf10458fe6edb87e60587a47de358" dependencies = [ "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-debug-derive 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-arithmetic 12.0.0", + "sp-core 16.0.0", + "sp-debug-derive 6.0.0", + "sp-std 6.0.0", ] [[package]] @@ -4768,6 +4754,16 @@ dependencies = [ "indexmap", ] +[[package]] +name = "wasmparser" +version = "0.96.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adde01ade41ab9a5d10ec8ed0bb954238cf8625b5cd5a13093d6de2ad9c2be1a" +dependencies = [ + "indexmap", + "url", +] + [[package]] name = "wasmtime" version = "1.0.2" @@ -4786,13 +4782,38 @@ dependencies = [ "psm", "serde", "target-lexicon", - "wasmparser", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-runtime", + "wasmparser 0.89.1", + "wasmtime-environ 1.0.2", + "wasmtime-jit 1.0.2", + "wasmtime-runtime 1.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e5b183a159484980138cc05231419c536d395a7b25c1802091310ea2f74276a" +dependencies = [ + "anyhow", + "bincode", + "cfg-if", + "indexmap", + "libc", + "log", + "object 0.29.0", + "once_cell", + "paste", + "psm", + "serde", + "target-lexicon", + "wasmparser 0.96.0", + "wasmtime-environ 5.0.0", + "wasmtime-jit 5.0.0", + "wasmtime-runtime 5.0.0", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-asm-macros" version = "1.0.2" @@ -4802,6 +4823,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0aeb1cb256d76cf07b20264c808351c8b525ece56de1ef4d93f87a0aaf342db" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-environ" version = "1.0.2" @@ -4809,7 +4839,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.88.2", + "gimli 0.26.2", + "indexmap", + "log", + "object 0.29.0", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.89.1", + "wasmtime-types 1.0.2", +] + +[[package]] +name = "wasmtime-environ" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a2a5f0fb93aa837a727a48dd1076e8a9f882cc2fee20b433c04a18740ff63b" +dependencies = [ + "anyhow", + "cranelift-entity 0.92.0", "gimli 0.26.2", "indexmap", "log", @@ -4817,8 +4866,8 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-types", + "wasmparser 0.96.0", + "wasmtime-types 5.0.0", ] [[package]] @@ -4836,15 +4885,38 @@ dependencies = [ "log", "object 0.29.0", "rustc-demangle", - "rustix", + "rustix 0.35.13", "serde", "target-lexicon", "thiserror", - "wasmtime-environ", - "wasmtime-runtime", + "wasmtime-environ 1.0.2", + "wasmtime-runtime 1.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-jit" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c78f9fb2922dbb5a95f009539d4badb44866caeeb53d156bf2cf4d683c3afd" +dependencies = [ + "addr2line 0.17.0", + "anyhow", + "bincode", + "cfg-if", + "cpp_demangle", + "gimli 0.26.2", + "log", + "object 0.29.0", + "rustc-demangle", + "serde", + "target-lexicon", + "wasmtime-environ 5.0.0", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime 5.0.0", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-jit-debug" version = "1.0.2" @@ -4854,6 +4926,26 @@ dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-debug" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cacdb52a77b8c8e744e510beeabf0bd698b1c94c59eed33c52b3fbd19639b0" +dependencies = [ + "once_cell", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08fcba5ebd96da2a9f0747ab6337fe9788adfb3f63fa2c180520d665562d257e" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-runtime" version = "1.0.2" @@ -4870,24 +4962,60 @@ dependencies = [ "memoffset", "paste", "rand 0.8.5", - "rustix", + "rustix 0.35.13", "thiserror", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-jit-debug", + "wasmtime-asm-macros 1.0.2", + "wasmtime-environ 1.0.2", + "wasmtime-jit-debug 1.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-runtime" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0793210acf50d4c69182c916abaee1d423dc5d172cdfde6acfea2f9446725940" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap", + "libc", + "log", + "mach", + "memfd", + "memoffset", + "paste", + "rand 0.8.5", + "rustix 0.36.9", + "wasmtime-asm-macros 5.0.0", + "wasmtime-environ 5.0.0", + "wasmtime-jit-debug 5.0.0", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-types" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.88.2", + "serde", + "thiserror", + "wasmparser 0.89.1", +] + +[[package]] +name = "wasmtime-types" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d015ba8b231248a811e323cf7a525cd3f982d4be0b9e62d27685102e5f12b1" +dependencies = [ + "cranelift-entity 0.92.0", "serde", "thiserror", - "wasmparser", + "wasmparser 0.96.0", ] [[package]] diff --git a/aleph-client/Cargo.toml b/aleph-client/Cargo.toml index 2f796f3e2f..c67ef3abcb 100644 --- a/aleph-client/Cargo.toml +++ b/aleph-client/Cargo.toml @@ -13,9 +13,7 @@ hex = { version = "0.4.3", features = ["alloc"] } log = "0.4" serde_json = { version = "1.0" } thiserror = "1.0" -contract-metadata = "2.0.0-beta" -contract-transcode = { git = "https://github.com/paritytech/cargo-contract", rev = "7ca8c365fc1e157cd52901c54949b2faf1cd8899" } -ink_metadata = "4.0.0-beta" +contract-transcode = "=2.0.2" subxt = "0.25.0" futures = "0.3.25" serde = { version = "1.0", features = ["derive"] } diff --git a/bin/cliain/Cargo.lock b/bin/cliain/Cargo.lock index cdc07271be..1ddb135628 100644 --- a/bin/cliain/Cargo.lock +++ b/bin/cliain/Cargo.lock @@ -74,19 +74,17 @@ version = "2.13.0" dependencies = [ "anyhow", "async-trait", - "contract-metadata 2.0.1", - "contract-transcode 2.0.0-beta.1", - "frame-support 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "contract-transcode", + "frame-support", "futures", "hex", - "ink_metadata", "log", "pallet-contracts-primitives", "parity-scale-codec", "primitives", "serde", "serde_json", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "subxt", "thiserror", ] @@ -315,6 +313,18 @@ dependencies = [ "byte-tools", ] +[[package]] +name = "bounded-collections" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a071c348a5ef6da1d3a87166b408170b46002382b1dda83992b5c2208cefb370" +dependencies = [ + "log", + "parity-scale-codec", + "scale-info", + "serde", +] + [[package]] name = "brownstone" version = "1.1.0" @@ -433,10 +443,9 @@ dependencies = [ "aleph_client", "anyhow", "clap", - "contract-metadata 0.6.0", - "contract-transcode 2.0.0-beta", + "contract-metadata", "dialoguer", - "env_logger 0.8.4", + "env_logger", "hex", "ink_metadata", "log", @@ -481,37 +490,12 @@ checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" [[package]] name = "contract-metadata" -version = "0.6.0" -source = "git+https://github.com/paritytech/cargo-contract.git?tag=v1.4.0#4e3a1981012999d310bd6e171aba4c5ffc7beaca" -dependencies = [ - "impl-serde 0.3.2", - "semver", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "contract-metadata" -version = "2.0.0-beta.1" -source = "git+https://github.com/paritytech/cargo-contract?rev=7ca8c365fc1e157cd52901c54949b2faf1cd8899#7ca8c365fc1e157cd52901c54949b2faf1cd8899" -dependencies = [ - "anyhow", - "impl-serde 0.4.0", - "semver", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "contract-metadata" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5997814dd5d45804757a616e938c28586875ac793ffc140e57e7ae9f421a066" +checksum = "9799ec9b939a0f54b4a043f821823135bae09ee337014b34392805cfcb8585bc" dependencies = [ "anyhow", - "impl-serde 0.4.0", + "impl-serde", "semver", "serde", "serde_json", @@ -520,37 +504,12 @@ dependencies = [ [[package]] name = "contract-transcode" -version = "2.0.0-beta" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61159f8e266d4892be25f2b1e7ff2c4c6dd4338ca26498d907e5532a52a28e5f" -dependencies = [ - "anyhow", - "contract-metadata 2.0.1", - "env_logger 0.9.3", - "escape8259", - "hex", - "indexmap", - "ink_env", - "ink_metadata", - "itertools", - "nom", - "nom-supreme", - "parity-scale-codec", - "scale-info", - "serde", - "serde_json", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing", -] - -[[package]] -name = "contract-transcode" -version = "2.0.0-beta.1" -source = "git+https://github.com/paritytech/cargo-contract?rev=7ca8c365fc1e157cd52901c54949b2faf1cd8899#7ca8c365fc1e157cd52901c54949b2faf1cd8899" +checksum = "e16783701c3f24f1e30ec3236ddade800b445e7bab6c3da354f33fe4b980bccd" dependencies = [ "anyhow", - "contract-metadata 2.0.0-beta.1", + "contract-metadata", "escape8259", "hex", "indexmap", @@ -563,8 +522,8 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 16.0.0", + "sp-runtime 18.0.0", "tracing", ] @@ -611,6 +570,15 @@ dependencies = [ "serde", ] +[[package]] +name = "cranelift-entity" +version = "0.92.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9e39cfc857e7e539aa623e03bb6bec11f54aef3dfdef41adcfa7b594af3b54" +dependencies = [ + "serde", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -981,19 +949,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "environmental" version = "1.1.4" @@ -1099,8 +1054,8 @@ name = "frame-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#85ce0f97d013118e17921af98cbc34ed00ec80e3" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "frame-support-procedural 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "frame-support", + "frame-support-procedural", "frame-system", "linregress", "log", @@ -1108,7 +1063,7 @@ dependencies = [ "paste", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", @@ -1136,7 +1091,7 @@ version = "4.0.0-dev" source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#85ce0f97d013118e17921af98cbc34ed00ec80e3" dependencies = [ "frame-election-provider-solution-type", - "frame-support 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", @@ -1166,7 +1121,7 @@ source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=alep dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", @@ -1176,14 +1131,14 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-api", "sp-arithmetic 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-inherents 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-core-hashing-proc-macro", + "sp-inherents", "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-staking 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-staking", "sp-state-machine 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-tracing 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", @@ -1191,38 +1146,6 @@ dependencies = [ "tt-call", ] -[[package]] -name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "bitflags", - "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "impl-trait-for-tuples", - "k256", - "log", - "once_cell", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-arithmetic 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-inherents 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-staking 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-state-machine 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-tracing 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-weights 4.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "tt-call", -] - [[package]] name = "frame-support-procedural" version = "4.0.0-dev" @@ -1231,22 +1154,7 @@ dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "itertools", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "Inflector", - "cfg-expr", - "derive-syn-parse", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "frame-support-procedural-tools", "itertools", "proc-macro2", "quote", @@ -1258,19 +1166,7 @@ name = "frame-support-procedural-tools" version = "4.0.0-dev" source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#85ce0f97d013118e17921af98cbc34ed00ec80e3" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", @@ -1287,22 +1183,12 @@ dependencies = [ "syn", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-system" version = "4.0.0-dev" source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#85ce0f97d013118e17921af98cbc34ed00ec80e3" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "frame-support", "log", "parity-scale-codec", "scale-info", @@ -1311,7 +1197,7 @@ dependencies = [ "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-version 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-version", "sp-weights 4.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", ] @@ -1752,15 +1638,6 @@ dependencies = [ "parity-scale-codec", ] -[[package]] -name = "impl-serde" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" -dependencies = [ - "serde", -] - [[package]] name = "impl-serde" version = "0.4.0" @@ -1800,18 +1677,18 @@ dependencies = [ [[package]] name = "ink_allocator" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5323d4f43900266f2d5462cbe2a96d4182d634da0cfc1078d26c74d4117e0ce9" +checksum = "a54dbbaffb0f97bcae062e628dcdc9da4d3c9044f5a53fb2715a328b07221631" dependencies = [ "cfg-if", ] [[package]] name = "ink_engine" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de001b0907475ab10211093569d8b92726ef7a37d04b6e90c8a2864fbe14d050" +checksum = "daed9b710cba6f50f1fa0372a7e8a47a35624d84af4ef2c3a8d34d4e96202d1c" dependencies = [ "blake2", "derive_more", @@ -1824,9 +1701,9 @@ dependencies = [ [[package]] name = "ink_env" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0354567725e4f635a5c5694e4e4cac105e3e78cefd948ca5ab6cc92ea3d8231" +checksum = "a41c6a3f4e740e27449f805ed47f536a35fb254ebcd03d2480014589331cda3e" dependencies = [ "arrayref", "blake2", @@ -1851,12 +1728,12 @@ dependencies = [ [[package]] name = "ink_metadata" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfb4d5448446656ebf83d800c06effeffc063967ef5986d7d1a277e3e507dae" +checksum = "5dfcfa666ada5729c7e4d3d986cd196365a2c469459fced4fa31dc6ad87c4d8f" dependencies = [ "derive_more", - "impl-serde 0.4.0", + "impl-serde", "ink_prelude", "ink_primitives", "scale-info", @@ -1865,18 +1742,18 @@ dependencies = [ [[package]] name = "ink_prelude" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2626fb0c922f923965774cdd8cddeaaa204931d0ed19e0bf43702b033924173" +checksum = "f8080235e5ae921975c2c7772fe9959e1b3c92b4d5a1afcfe104f93fb79aa268" dependencies = [ "cfg-if", ] [[package]] name = "ink_primitives" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91066af898fe4c59b2ed0aca678238928b551dc75f5284bf1422e9f1bb6b2204" +checksum = "f1b3f711d857d2de7c08158369cc32a762833ac211a00aac7931992094e25741" dependencies = [ "derive_more", "ink_prelude", @@ -1887,9 +1764,9 @@ dependencies = [ [[package]] name = "ink_storage_traits" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da15ceaef6bdbece3e8b6338df899ef94e3921d03387fa941af8df3b38803523" +checksum = "8c90e11b60233ae5ab877854739da2c380a337cb31b3900cb50328821c0381b6" dependencies = [ "ink_metadata", "ink_prelude", @@ -1923,6 +1800,16 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +[[package]] +name = "io-lifetimes" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -2154,6 +2041,12 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.4.9" @@ -2215,6 +2108,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memfd" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" +dependencies = [ + "rustix 0.36.9", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -2485,7 +2387,7 @@ name = "pallet-authorship" version = "4.0.0-dev" source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#85ce0f97d013118e17921af98cbc34ed00ec80e3" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", @@ -2497,13 +2399,13 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#0d25bff2ff35d900a27efc93538d8b9d291f7381" dependencies = [ "bitflags", "parity-scale-codec", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-weights 4.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-weights 4.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", ] [[package]] @@ -2511,7 +2413,7 @@ name = "pallet-session" version = "4.0.0-dev" source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#85ce0f97d013118e17921af98cbc34ed00ec80e3" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "frame-support", "frame-system", "impl-trait-for-tuples", "log", @@ -2522,7 +2424,7 @@ dependencies = [ "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-trie 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", ] @@ -2534,7 +2436,7 @@ source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=alep dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "frame-support", "frame-system", "log", "pallet-authorship", @@ -2545,7 +2447,7 @@ dependencies = [ "sp-application-crypto 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-staking 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", ] @@ -2555,12 +2457,12 @@ version = "4.0.0-dev" source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#85ce0f97d013118e17921af98cbc34ed00ec80e3" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-inherents", "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", @@ -2750,7 +2652,7 @@ checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", - "impl-serde 0.4.0", + "impl-serde", "scale-info", "uint", ] @@ -2762,12 +2664,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-application-crypto 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-staking 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-api", + "sp-application-crypto 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-staking", + "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", ] [[package]] @@ -3056,12 +2958,26 @@ checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.7.5", "libc", - "linux-raw-sys", + "linux-raw-sys 0.0.46", "windows-sys 0.42.0", ] +[[package]] +name = "rustix" +version = "0.36.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.6", + "libc", + "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", +] + [[package]] name = "rustls" version = "0.20.8" @@ -3508,31 +3424,13 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-api-proc-macro", "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-state-machine 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-trie 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-version 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "thiserror", -] - -[[package]] -name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-state-machine 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-trie 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-version 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-version", "thiserror", ] @@ -3548,18 +3446,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "blake2", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-application-crypto" version = "7.0.0" @@ -3589,15 +3475,16 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f08604ba4bd856311946722958711a08bded5c929e1227f7a697c58deb09468" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-io 17.0.0", + "sp-std 6.0.0", ] [[package]] @@ -3632,15 +3519,16 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7796939f2e3b68a3b9410ea17a2063b78038cd366f57fa772dd3be0798bd3412" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", "static_assertions", ] @@ -3660,7 +3548,7 @@ dependencies = [ "futures", "hash-db", "hash256-std-hasher", - "impl-serde 0.4.0", + "impl-serde", "lazy_static", "libsecp256k1", "log", @@ -3704,7 +3592,7 @@ dependencies = [ "futures", "hash-db", "hash256-std-hasher", - "impl-serde 0.4.0", + "impl-serde", "lazy_static", "libsecp256k1", "log", @@ -3734,19 +3622,21 @@ dependencies = [ [[package]] name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c96dc3debbe5c22ebf18f99e6a53199efe748e6e584a1902adb88cbad66ae7c" dependencies = [ "array-bytes", "base58", "bitflags", "blake2", + "bounded-collections", "dyn-clonable", "ed25519-zebra", "futures", "hash-db", "hash256-std-hasher", - "impl-serde 0.4.0", + "impl-serde", "lazy_static", "libsecp256k1", "log", @@ -3761,12 +3651,12 @@ dependencies = [ "secp256k1 0.24.3", "secrecy", "serde", - "sp-core-hashing 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-debug-derive 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime-interface 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-storage 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core-hashing 6.0.0", + "sp-debug-derive 6.0.0", + "sp-externalities 0.17.0", + "sp-runtime-interface 13.0.0", + "sp-std 6.0.0", + "sp-storage 11.0.0", "ss58-registry", "substrate-bip39", "thiserror", @@ -3805,15 +3695,16 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc2d1947252b7a4e403b0a260f596920443742791765ec111daa2bbf98eff25" dependencies = [ "blake2", "byteorder", "digest 0.10.6", "sha2 0.10.6", "sha3", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", "twox-hash", ] @@ -3828,17 +3719,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "syn", -] - [[package]] name = "sp-debug-derive" version = "5.0.0" @@ -3862,8 +3742,9 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fb9dc63d54de7d7bed62a505b6e0bd66c122525ea1abb348f6564717c3df2d" dependencies = [ "proc-macro2", "quote", @@ -3895,13 +3776,14 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57052935c9c9b070ea6b339ef0da3bf241b7e065fc37f9c551669ee83ecfc3c1" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-storage 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", + "sp-storage 11.0.0", ] [[package]] @@ -3918,20 +3800,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "thiserror", -] - [[package]] name = "sp-io" version = "7.0.0" @@ -3986,8 +3854,9 @@ dependencies = [ [[package]] name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578959f9a7e44fd2dd96e8b8bc893cea04fcd7c00a4ffbb0b91c5013899dd02b" dependencies = [ "bytes", "ed25519", @@ -3997,14 +3866,14 @@ dependencies = [ "log", "parity-scale-codec", "secp256k1 0.24.3", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-keystore 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime-interface 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-state-machine 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-tracing 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-trie 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-externalities 0.17.0", + "sp-keystore 0.22.0", + "sp-runtime-interface 13.0.0", + "sp-state-machine 0.22.0", + "sp-std 6.0.0", + "sp-tracing 8.0.0", + "sp-trie 16.0.0", "tracing", "tracing-core", ] @@ -4044,8 +3913,9 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480dbd54b281c638209fbcfce69902b82a0a1af0e22219d46825eadced3136b6" dependencies = [ "async-trait", "futures", @@ -4053,8 +3923,8 @@ dependencies = [ "parity-scale-codec", "parking_lot", "schnorrkel", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-externalities 0.17.0", "thiserror", ] @@ -4095,8 +3965,9 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4abed79c3d5b3622f65ab065676addd9923b9b122cd257df23e2757ce487c6d2" dependencies = [ "backtrace", "lazy_static", @@ -4151,8 +4022,9 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8ab2fd44668d3e8674e2253a43852857a47d49be7db737e98bf157e4bcebefd" dependencies = [ "either", "hash256-std-hasher", @@ -4163,12 +4035,12 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-arithmetic 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-io 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-weights 4.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-application-crypto 17.0.0", + "sp-arithmetic 12.0.0", + "sp-core 16.0.0", + "sp-io 17.0.0", + "sp-std 6.0.0", + "sp-weights 14.0.0", ] [[package]] @@ -4210,19 +4082,20 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb7707246cee4967a8cc71e3ef0e82f562e8b1020606447a6a12b99c7c1b443" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime-interface-proc-macro 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-storage 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-tracing 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-wasm-interface 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-externalities 0.17.0", + "sp-runtime-interface-proc-macro 9.0.0", + "sp-std 6.0.0", + "sp-storage 11.0.0", + "sp-tracing 8.0.0", + "sp-wasm-interface 10.0.0", "static_assertions", ] @@ -4253,8 +4126,9 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2773c90e5765847c5e8b4a24b553d38a9ca52ded47c142cfcfb7948f42827af9" dependencies = [ "Inflector", "proc-macro-crate", @@ -4270,10 +4144,10 @@ source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=alep dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-api", "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-staking 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", ] @@ -4289,18 +4163,6 @@ dependencies = [ "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", ] -[[package]] -name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", -] - [[package]] name = "sp-state-machine" version = "0.13.0" @@ -4346,8 +4208,9 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c957b8b4c252507c12674948db427c5e34fd1760ce256922f1ec5f89f781a4f" dependencies = [ "hash-db", "log", @@ -4355,11 +4218,11 @@ dependencies = [ "parking_lot", "rand 0.8.5", "smallvec", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-externalities 0.13.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-panic-handler 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-trie 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-externalities 0.17.0", + "sp-panic-handler 6.0.0", + "sp-std 6.0.0", + "sp-trie 16.0.0", "thiserror", "tracing", ] @@ -4377,8 +4240,9 @@ source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=alep [[package]] name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e" [[package]] name = "sp-storage" @@ -4386,7 +4250,7 @@ version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb987ed2e4d7d870170a225083ea962f2a359d75cdf76935d5ed8d91bee912d9" dependencies = [ - "impl-serde 0.4.0", + "impl-serde", "parity-scale-codec", "ref-cast", "serde", @@ -4399,7 +4263,7 @@ name = "sp-storage" version = "7.0.0" source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#85ce0f97d013118e17921af98cbc34ed00ec80e3" dependencies = [ - "impl-serde 0.4.0", + "impl-serde", "parity-scale-codec", "ref-cast", "serde", @@ -4409,15 +4273,16 @@ dependencies = [ [[package]] name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c20cb0c562d1a159ecb2c7ca786828c81e432c535474967d2df3a484977cea4" dependencies = [ - "impl-serde 0.4.0", + "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-debug-derive 6.0.0", + "sp-std 6.0.0", ] [[package]] @@ -4429,7 +4294,7 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-inherents 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "thiserror", @@ -4462,11 +4327,12 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46bd547da89a9cda69b4ce4c91a5b7e1f86915190d83cd407b715d0c6bac042" dependencies = [ "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", "tracing", "tracing-core", "tracing-subscriber", @@ -4521,8 +4387,9 @@ dependencies = [ [[package]] name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8efbe5b6d29a18fea7c2f52e0098135f2f864b31d335d5105b40a349866ba874" dependencies = [ "ahash 0.8.3", "hash-db", @@ -4534,8 +4401,8 @@ dependencies = [ "parking_lot", "scale-info", "schnellru", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-core 16.0.0", + "sp-std 6.0.0", "thiserror", "tracing", "trie-db", @@ -4547,32 +4414,15 @@ name = "sp-version" version = "5.0.0" source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38#85ce0f97d013118e17921af98cbc34ed00ec80e3" dependencies = [ - "impl-serde 0.4.0", + "impl-serde", "parity-scale-codec", "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", + "sp-core-hashing-proc-macro", "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", - "thiserror", -] - -[[package]] -name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "impl-serde 0.4.0", - "parity-scale-codec", - "parity-wasm", - "scale-info", - "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-runtime 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-version-proc-macro", "thiserror", ] @@ -4587,17 +4437,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" -dependencies = [ - "parity-scale-codec", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-wasm-interface" version = "7.0.0" @@ -4621,20 +4460,22 @@ dependencies = [ "parity-scale-codec", "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=aleph-v0.9.38)", "wasmi", - "wasmtime", + "wasmtime 1.0.2", ] [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbc05650b6338808892a7b04f0c56bb1f7f928bfa9ac58e0af2c1e5bef33229" dependencies = [ + "anyhow", "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-std 6.0.0", "wasmi", - "wasmtime", + "wasmtime 5.0.1", ] [[package]] @@ -4671,17 +4512,18 @@ dependencies = [ [[package]] name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38#140608987761992352ba19e9e0883f5cb8bd6d2a" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ebab7696f915aa548494aef3ca8d15217baf10458fe6edb87e60587a47de358" dependencies = [ "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic 6.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-core 7.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-debug-derive 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", - "sp-std 5.0.0 (git+https://github.com/Cardinal-Cryptography/substrate.git?branch=wip-v0.9.38)", + "sp-arithmetic 12.0.0", + "sp-core 16.0.0", + "sp-debug-derive 6.0.0", + "sp-std 6.0.0", ] [[package]] @@ -5392,6 +5234,16 @@ dependencies = [ "indexmap", ] +[[package]] +name = "wasmparser" +version = "0.96.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adde01ade41ab9a5d10ec8ed0bb954238cf8625b5cd5a13093d6de2ad9c2be1a" +dependencies = [ + "indexmap", + "url", +] + [[package]] name = "wasmtime" version = "1.0.2" @@ -5410,13 +5262,38 @@ dependencies = [ "psm", "serde", "target-lexicon", - "wasmparser", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-runtime", + "wasmparser 0.89.1", + "wasmtime-environ 1.0.2", + "wasmtime-jit 1.0.2", + "wasmtime-runtime 1.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49ffcc607adc9da024e87ca814592d4bc67f5c5b58e488f5608d5734a1ebc23e" +dependencies = [ + "anyhow", + "bincode", + "cfg-if", + "indexmap", + "libc", + "log", + "object 0.29.0", + "once_cell", + "paste", + "psm", + "serde", + "target-lexicon", + "wasmparser 0.96.0", + "wasmtime-environ 5.0.1", + "wasmtime-jit 5.0.1", + "wasmtime-runtime 5.0.1", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-asm-macros" version = "1.0.2" @@ -5426,6 +5303,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "wasmtime-asm-macros" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12cb5dc4d79cd7b2453c395f64e9013d2ad90bd083be556d5565cb224ebe8d57" +dependencies = [ + "cfg-if", +] + [[package]] name = "wasmtime-environ" version = "1.0.2" @@ -5433,7 +5319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" dependencies = [ "anyhow", - "cranelift-entity", + "cranelift-entity 0.88.2", "gimli 0.26.2", "indexmap", "log", @@ -5441,8 +5327,27 @@ dependencies = [ "serde", "target-lexicon", "thiserror", - "wasmparser", - "wasmtime-types", + "wasmparser 0.89.1", + "wasmtime-types 1.0.2", +] + +[[package]] +name = "wasmtime-environ" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9350c919553cddf14f78f9452119c8004d7ef6bfebb79a41a21819ed0c5604d8" +dependencies = [ + "anyhow", + "cranelift-entity 0.92.1", + "gimli 0.26.2", + "indexmap", + "log", + "object 0.29.0", + "serde", + "target-lexicon", + "thiserror", + "wasmparser 0.96.0", + "wasmtime-types 5.0.1", ] [[package]] @@ -5460,15 +5365,38 @@ dependencies = [ "log", "object 0.29.0", "rustc-demangle", - "rustix", + "rustix 0.35.13", "serde", "target-lexicon", "thiserror", - "wasmtime-environ", - "wasmtime-runtime", + "wasmtime-environ 1.0.2", + "wasmtime-runtime 1.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-jit" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ba5779ea786386432b94c9fc9ad5597346c319e8239db0d98d5be5cc109a7e" +dependencies = [ + "addr2line 0.17.0", + "anyhow", + "bincode", + "cfg-if", + "cpp_demangle", + "gimli 0.26.2", + "log", + "object 0.29.0", + "rustc-demangle", + "serde", + "target-lexicon", + "wasmtime-environ 5.0.1", + "wasmtime-jit-icache-coherence", + "wasmtime-runtime 5.0.1", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-jit-debug" version = "1.0.2" @@ -5478,6 +5406,26 @@ dependencies = [ "once_cell", ] +[[package]] +name = "wasmtime-jit-debug" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9841a44c82c74101c10ad4f215392761a2523b3c6c838597962bdb6de75fdb3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "wasmtime-jit-icache-coherence" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd4356c2493002da3b111d470c2ecea65a3017009afce8adc46eaa5758739891" +dependencies = [ + "cfg-if", + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-runtime" version = "1.0.2" @@ -5494,24 +5442,60 @@ dependencies = [ "memoffset", "paste", "rand 0.8.5", - "rustix", + "rustix 0.35.13", "thiserror", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-jit-debug", + "wasmtime-asm-macros 1.0.2", + "wasmtime-environ 1.0.2", + "wasmtime-jit-debug 1.0.2", "windows-sys 0.36.1", ] +[[package]] +name = "wasmtime-runtime" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd26efea7a790fcf430e663ba2519f0ab6eb8980adf8b0c58c62b727da77c2ec" +dependencies = [ + "anyhow", + "cc", + "cfg-if", + "indexmap", + "libc", + "log", + "mach", + "memfd", + "memoffset", + "paste", + "rand 0.8.5", + "rustix 0.36.9", + "wasmtime-asm-macros 5.0.1", + "wasmtime-environ 5.0.1", + "wasmtime-jit-debug 5.0.1", + "windows-sys 0.42.0", +] + [[package]] name = "wasmtime-types" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" dependencies = [ - "cranelift-entity", + "cranelift-entity 0.88.2", + "serde", + "thiserror", + "wasmparser 0.89.1", +] + +[[package]] +name = "wasmtime-types" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86e1e4f66a2b9a114f9def450ab9971828c968db6ea6fccd613724b771fa4913" +dependencies = [ + "cranelift-entity 0.92.1", "serde", "thiserror", - "wasmparser", + "wasmparser 0.96.0", ] [[package]] diff --git a/bin/cliain/Cargo.toml b/bin/cliain/Cargo.toml index 802a1191d7..ffd9f607c2 100644 --- a/bin/cliain/Cargo.toml +++ b/bin/cliain/Cargo.toml @@ -9,12 +9,11 @@ aleph_client = { path = "../../aleph-client" } anyhow = "1.0" clap = { version = "3.0", features = ["derive"] } codec = { package = 'parity-scale-codec', version = "3.0.0", features = ['derive'] } -contract-metadata = { git = "https://github.com/paritytech/cargo-contract.git", tag = "v1.4.0"} -contract-transcode = { version = "=2.0.0-beta" } +contract-metadata = "2.0.2" dialoguer = "0.10.0" env_logger = "0.8" hex = "0.4.3" -ink_metadata = { version = "4.0.0-beta", features = ["derive"] } +ink_metadata = { version = "=4.0.1", features = ["derive"] } log = "0.4" pallet-staking = { git = "https://github.com/Cardinal-Cryptography/substrate.git", branch = "aleph-v0.9.38" } primitives = { path = "../../primitives" } diff --git a/bin/cliain/src/contracts.rs b/bin/cliain/src/contracts.rs index 3b5599aa46..456f65a087 100644 --- a/bin/cliain/src/contracts.rs +++ b/bin/cliain/src/contracts.rs @@ -5,6 +5,7 @@ use std::{ use aleph_client::{ api::contracts::events::{CodeRemoved, CodeStored, Instantiated}, + contract_transcode, pallet_contracts::wasm::OwnerInfo, pallets::contract::{ContractsApi, ContractsUserApi}, sp_weights::weight_v2::Weight, @@ -13,13 +14,15 @@ use aleph_client::{ }; use codec::{Compact, Decode}; use contract_metadata::ContractMetadata; -use contract_transcode::ContractMessageTranscoder; use log::{debug, info}; use serde::{Deserialize, Serialize}; -use crate::commands::{ - ContractCall, ContractInstantiate, ContractInstantiateWithCode, ContractOptions, - ContractOwnerInfo, ContractRemoveCode, ContractUploadCode, +use crate::{ + commands::{ + ContractCall, ContractInstantiate, ContractInstantiateWithCode, ContractOptions, + ContractOwnerInfo, ContractRemoveCode, ContractUploadCode, + }, + contracts::contract_transcode::ContractMessageTranscoder, }; #[derive(Debug, Decode, Clone, Serialize, Deserialize)]