diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock index 5fefb5804..615641c30 100644 --- a/contracts/Cargo.lock +++ b/contracts/Cargo.lock @@ -14,8 +14,9 @@ dependencies = [ [[package]] name = "actor-system-error" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df50509e2b16b0a7dcf58c7065fc95576b8e38117fd5e6db119b694320743baa" dependencies = [ "derive_more", ] @@ -31,11 +32,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ - "gimli 0.28.1", + "gimli 0.29.0", ] [[package]] @@ -150,21 +151,157 @@ checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools", + "num-bigint", + "num-traits", + "paste", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-scale" +version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "5f69c00b3b529be29528a6f2fd5fa7b1790f8bed81b9cdca17e326538545a179" +dependencies = [ + "ark-serialize", + "ark-std", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "array-bytes" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] name = "array-bytes" -version = "6.2.2" +version = "6.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0" +checksum = "5d5dde061bd34119e902bbb2d9b90c5692635cf59fb91d582c2b68043f1b8293" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -200,22 +337,21 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -258,17 +394,17 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", + "polling 3.7.2", "rustix 0.38.34", "slab", "tracing", @@ -286,12 +422,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -325,12 +461,12 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.3", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", @@ -349,13 +485,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -384,7 +520,7 @@ dependencies = [ "gtest", "hex-literal", "primitive-types", - "sp-core 22.0.0", + "sp-core 21.0.0", "sp-core-hashing 10.0.0", "tokio", ] @@ -418,16 +554,16 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ - "addr2line 0.21.0", + "addr2line 0.22.0", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.32.2", + "object 0.36.2", "rustc-demangle", ] @@ -468,7 +604,7 @@ dependencies = [ "battleship-bot", "battleship-io", "gclient", - "gear-core 1.4.0", + "gear-core", "gear-wasm-builder", "gstd", "gtest", @@ -536,9 +672,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -584,9 +720,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec 0.7.4", @@ -636,12 +772,11 @@ dependencies = [ [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.2.1", - "async-lock 3.3.0", + "async-channel 2.3.1", "async-task", "futures-io", "futures-lite 2.3.0", @@ -723,15 +858,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] @@ -775,7 +910,7 @@ dependencies = [ "car-3", "car-races-io", "gclient", - "gear-core 1.4.0", + "gear-core", "gear-wasm-builder", "gstd", "gtest", @@ -818,11 +953,21 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cargo_toml" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be" +dependencies = [ + "serde", + "toml", +] + [[package]] name = "cc" -version = "1.0.97" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" [[package]] name = "cfg-expr" @@ -874,7 +1019,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -890,18 +1035,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac" dependencies = [ "anstyle", "clap_lex", @@ -909,9 +1054,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "cmake" @@ -1046,6 +1191,24 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +[[package]] +name = "core-processor" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7005388219d8915f8e21c2a662bbf26e63302122b012011659dc40b44e08df" +dependencies = [ + "actor-system-error", + "derive_more", + "gear-core", + "gear-core-backend", + "gear-core-errors", + "gear-lazy-pages-common", + "gear-wasm-instrument", + "gsys", + "log", + "scale-info", +] + [[package]] name = "corosensei" version = "0.1.4" @@ -1147,9 +1310,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -1184,9 +1347,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crowdsale" @@ -1264,9 +1427,9 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array 0.14.7", "subtle", @@ -1309,16 +1472,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms", "rustc_version", "subtle", "zeroize", @@ -1332,7 +1494,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -1425,12 +1587,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1443,22 +1605,22 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.61", + "strsim 0.11.1", + "syn 2.0.72", ] [[package]] @@ -1474,40 +1636,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.10", "quote", - "syn 2.0.61", -] - -[[package]] -name = "ddns" -version = "1.1.0" -dependencies = [ - "ddns-io", - "gear-wasm-builder", - "gstd", -] - -[[package]] -name = "ddns-io" -version = "1.1.0" -dependencies = [ - "gmeta", - "gstd", -] - -[[package]] -name = "ddns-state" -version = "1.1.0" -dependencies = [ - "ddns-io", - "gear-wasm-builder", - "gmeta", - "gstd", + "syn 2.0.72", ] [[package]] @@ -1628,15 +1763,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -1649,7 +1784,7 @@ dependencies = [ "dex-io", "dex-state", "gclient", - "gear-core 1.4.0", + "gear-core", "gear-lib", "gear-wasm-builder", "gstd", @@ -1846,7 +1981,7 @@ dependencies = [ "gtest", "hex-literal", "primitive-types", - "sp-core 22.0.0", + "sp-core 21.0.0", "sp-core-hashing 10.0.0", "tokio", ] @@ -1949,9 +2084,9 @@ dependencies = [ [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -2009,28 +2144,28 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ - "darling 0.20.8", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -2104,6 +2239,12 @@ dependencies = [ "primitive-types", ] +[[package]] +name = "etc" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b241177c7107d9829286c2ffdc5eee98d992d6356f3515e7f412f988b1a72fd" + [[package]] name = "event-listener" version = "2.5.3" @@ -2123,58 +2264,38 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] [[package]] name = "expander" -version = "2.1.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e83c02035136f1592a47964ea60c05a50e4ed8b5892cfac197063850898d4d" +checksum = "e2c470c71d91ecbd179935b24170459e926382eaaa86b590b78814e180d8a8e2" dependencies = [ "blake2", + "file-guard", "fs-err", - "prettier-please", + "prettyplease", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -2275,9 +2396,19 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.8" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "file-guard" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" +checksum = "21ef72acf95ec3d7dbf61275be556299490a245f017cf084bd23b4f68cf9407c" +dependencies = [ + "libc", + "winapi", +] [[package]] name = "fixed-hash" @@ -2331,8 +2462,9 @@ dependencies = [ [[package]] name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12ab435a28c0b92be45e871a20faae7307a5f1153168aed11076892511b97332" dependencies = [ "bitflags 1.3.2", "environmental", @@ -2348,25 +2480,26 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", + "sp-arithmetic", + "sp-core 22.0.0", "sp-core-hashing-proc-macro", - "sp-debug-derive 8.0.0", + "sp-debug-derive 9.0.0", "sp-inherents", - "sp-io 23.0.0", - "sp-runtime 24.0.0", + "sp-io", + "sp-runtime", "sp-staking", - "sp-state-machine 0.28.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "sp-tracing 10.0.0", - "sp-weights 20.0.0", + "sp-state-machine", + "sp-std 9.0.0", + "sp-tracing 11.0.0", + "sp-weights", "tt-call", ] [[package]] name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "17.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3515d87fdbf82fa3e5a03b4318ee897c3b2adda928625146dd7d33d52bc2978" dependencies = [ "Inflector", "cfg-expr", @@ -2378,35 +2511,38 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "072beafb884cd1c046188c64d593cacb6860314f50478a3713438cc56bee42de" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3562da4b7b8e24189036c58d459b260e10c8b7af2dd180b7869ae29bb66277" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "frame-system" -version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "22.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c5104921b9e4e8ffee5251caf7d28defa4e97080554b0e57f93a72b1ec8b915" dependencies = [ "cfg-if", "frame-support", @@ -2414,12 +2550,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-core 22.0.0", + "sp-io", + "sp-runtime", + "sp-std 9.0.0", "sp-version", - "sp-weights 20.0.0", + "sp-weights", ] [[package]] @@ -2551,7 +2687,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -2615,9 +2751,9 @@ dependencies = [ [[package]] name = "galloc" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051badf0179b74ab843eece3910c19b83910e417c0416ecd5c81c7f6979f8d3f" +checksum = "6c9f5076d43a53129240a66818481b9878b6ac57ad880e79fd35a3fcef1c45f9" dependencies = [ "gear-dlmalloc", ] @@ -2652,16 +2788,17 @@ dependencies = [ [[package]] name = "gclient" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368023dcf7ec991e47f9a7fbaae60503165e2e0e18c47f96bdf49196c8874e51" +checksum = "5abb6a987d9a9896f0716b8e9cad9b7bd699cd5b04fdd0d5a533908dc944281e" dependencies = [ "anyhow", "async-trait", "futures", - "gear-core 1.4.0", - "gear-core-errors 1.4.0", - "gear-utils 1.4.0", + "gear-core", + "gear-core-errors", + "gear-node-wrapper", + "gear-utils", "gsdk", "hex", "parity-scale-codec", @@ -2673,128 +2810,102 @@ dependencies = [ [[package]] name = "gcore" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabac75e218c4462ea6ae167717de90e567516690db1fd923ce1aed934837ecc" +checksum = "9c272adfc55e4a4a8a41aee309f13f5c57a25194bad7c7cc5a0fb37d07f3547e" dependencies = [ - "gear-core-errors 1.4.0", + "gear-core-errors", "gear-stack-buffer", - "gsys 1.4.0", + "gprimitives", + "gsys", "parity-scale-codec", ] [[package]] name = "gear-common" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "103731a2c79da16b2cd6fccbdfb80a4da9ec809e41e2f22d26f6c2e1acba5ba7" dependencies = [ "derive_more", "enum-iterator 1.5.0", "frame-support", "frame-system", "gear-common-codegen", - "gear-core 1.1.0", - "gear-wasm-instrument 1.1.0", - "gsys 1.1.0", + "gear-core", + "gear-wasm-instrument", + "gsys", "log", "primitive-types", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-arithmetic", + "sp-core 22.0.0", + "sp-io", + "sp-runtime", + "sp-std 9.0.0", ] [[package]] name = "gear-common-codegen" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf844e4632df1eb661ed2ada2d6514bbf385bf2e560d78e94437015d52f5066" dependencies = [ "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "gear-core" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e43021b90b559ae98879022985d3e5d9c47ef7b639d44cc0696b9f45d076a7" dependencies = [ - "blake2-rfc", + "blake2", "byteorder", "derive_more", "enum-iterator 1.5.0", - "gear-core-errors 1.1.0", - "gear-wasm-instrument 1.1.0", - "gsys 1.1.0", + "gear-core-errors", + "gear-wasm-instrument", + "gprimitives", + "gsys", "hashbrown 0.14.5", "hex", "log", "num-traits", + "numerated", "parity-scale-codec", "paste", + "primitive-types", "scale-info", "serde", "wasmparser-nostd", ] [[package]] -name = "gear-core" -version = "1.4.0" +name = "gear-core-backend" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9dc6c7c95ee6c325e756c44d71eeac1b1f0425f57d031474d23cda545f7a03" +checksum = "f907e5d4374ce20cd5af5fefc1b5b84f515e6cfe8b3da11e1fd5aacd94faec35" dependencies = [ - "blake2-rfc", - "byteorder", + "actor-system-error", + "blake2", "derive_more", - "enum-iterator 1.5.0", - "gear-core-errors 1.4.0", - "gear-wasm-instrument 1.4.0", - "gsys 1.4.0", - "hashbrown 0.14.5", - "hex", - "log", - "num-traits", - "numerated", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "wasmparser-nostd", -] - -[[package]] -name = "gear-core-backend" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" -dependencies = [ - "actor-system-error", - "blake2-rfc", - "derive_more", - "gear-core 1.1.0", - "gear-core-errors 1.1.0", - "gear-lazy-pages-common", - "gear-sandbox", - "gear-sandbox-env", - "gear-wasm-instrument 1.1.0", - "gsys 1.1.0", + "gear-core", + "gear-core-errors", + "gear-lazy-pages-common", + "gear-sandbox", + "gear-sandbox-env", + "gear-wasm-instrument", + "gsys", "log", "parity-scale-codec", ] [[package]] name = "gear-core-errors" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" -dependencies = [ - "derive_more", - "enum-iterator 1.5.0", - "scale-info", -] - -[[package]] -name = "gear-core-errors" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2067ae7fcbe4daa02fca1afa231da90ea251cf02c670f35f22a3d34965a230a2" +checksum = "5ea454c3f84f392c9c11b90e966d15e2dd037a91dd5abeaf3493f199c91b4012" dependencies = [ "derive_more", "enum-iterator 1.5.0", @@ -2802,24 +2913,6 @@ dependencies = [ "serde", ] -[[package]] -name = "gear-core-processor" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" -dependencies = [ - "actor-system-error", - "derive_more", - "gear-core 1.1.0", - "gear-core-backend", - "gear-core-errors 1.1.0", - "gear-lazy-pages-common", - "gear-lazy-pages-interface", - "gear-wasm-instrument 1.1.0", - "gsys 1.1.0", - "log", - "scale-info", -] - [[package]] name = "gear-dlmalloc" version = "0.2.0" @@ -2835,19 +2928,21 @@ dependencies = [ [[package]] name = "gear-lazy-pages" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba02ed1797a352a7a45755eff098ca8b535cf3044b7912643ac8b394e954f9b" dependencies = [ "cfg-if", "derive_more", "errno", - "gear-core 1.1.0", + "gear-core", "gear-lazy-pages-common", "gear-sandbox-host", "libc", "log", "mach", "nix", + "numerated", "region", "sp-wasm-interface-common", "winapi", @@ -2855,26 +2950,25 @@ dependencies = [ [[package]] name = "gear-lazy-pages-common" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6efd5c33738804fd10514c57e71428b9d2ff4edee0591fbba2e9c5a7bbe9f004" dependencies = [ - "gear-core 1.1.0", + "gear-core", "num_enum", "parity-scale-codec", ] [[package]] -name = "gear-lazy-pages-interface" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +name = "gear-lazy-pages-native-interface" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "571e65a1290e7b12a69f0af6f8e63b0c81c9e73737d4f3fbb3bfbf1c744160f9" dependencies = [ - "byteorder", - "gear-common", - "gear-core 1.1.0", + "gear-core", + "gear-lazy-pages", "gear-lazy-pages-common", - "gear-runtime-interface", - "log", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "gear-wasm-instrument", ] [[package]] @@ -2892,7 +2986,7 @@ name = "gear-lib-derive" version = "1.1.0" dependencies = [ "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -2904,6 +2998,18 @@ dependencies = [ "schnorrkel 0.10.2", ] +[[package]] +name = "gear-node-wrapper" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cb74b08a115081eb977fa2de8865a2ee911671af6888fa4090708d11487cfe9" +dependencies = [ + "anyhow", + "rand 0.8.5", + "smallvec", + "which", +] + [[package]] name = "gear-pwasm-utils" version = "0.19.0" @@ -2917,62 +3023,72 @@ dependencies = [ [[package]] name = "gear-runtime-interface" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4862e97c4a2ee9d93dacee1ed8aba7d5307b8a78bcf3e837b4cf7e19df556eac" dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-scale", "byteorder", - "gear-core 1.1.0", + "gear-core", "gear-lazy-pages", "gear-lazy-pages-common", "gear-sandbox-host", + "gp-runtime-interface", + "gp-wasm-interface", "log", "parity-scale-codec", - "sp-io 23.0.0", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "sp-wasm-interface 14.0.0", + "sha2 0.10.8", + "sp-io", + "sp-std 9.0.0", "winapi", ] [[package]] name = "gear-sandbox" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66c6bfa8ed3e68b855f82f5b128c83fcaa75ba2d2fb30776ac9a2af5d94b600a" dependencies = [ "gear-runtime-interface", "gear-sandbox-env", + "gwasmi", "log", "parity-scale-codec", - "sp-core 21.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-core 22.0.0", + "sp-std 9.0.0", "sp-wasm-interface-common", - "wasmi 0.30.0 (git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0)", ] [[package]] name = "gear-sandbox-env" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc42420cd1428a2ea5d36dd167b6228e3a14d65678115a9f42be9005596c32f" dependencies = [ "parity-scale-codec", - "sp-debug-derive 8.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-debug-derive 9.0.0", + "sp-std 9.0.0", "sp-wasm-interface-common", ] [[package]] name = "gear-sandbox-host" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12a668e124bd3c885f462ab7b4981fde4dca2de88f08763711c5922d11d04852" dependencies = [ "environmental", "gear-sandbox-env", + "gp-allocator", "log", "parity-scale-codec", - "sp-allocator", "sp-wasm-interface-common", "tempfile", "thiserror", + "uluru", "wasmer", "wasmer-cache", "wasmer-types", @@ -2981,44 +3097,29 @@ dependencies = [ [[package]] name = "gear-ss58" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366360488f7c2d8541a0ab9a2786285e27b64cd2c9dbeaca201d990e9778e84f" +checksum = "9a54d1199553745126a7a519d64e748b71b1927c2da54bb4758791d5e6131596" dependencies = [ - "anyhow", "blake2", "bs58 0.5.1", + "hex", ] [[package]] name = "gear-stack-buffer" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4c44216fca30facef9573198cb5a06af21f1dd9f6487b8ba3bcc69a69aeb6a" - -[[package]] -name = "gear-utils" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" -dependencies = [ - "env_logger", - "gear-core 1.1.0", - "hex", - "nonempty", - "parity-scale-codec", - "path-clean", - "serde", - "serde_json", -] +checksum = "68a0f6dfda464d2293ae6808aee9245a194799db651f888076020c65c30a66ee" [[package]] name = "gear-utils" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea8a0b46c0edadc7078ad1b58b3b70fdb46a5b2a42e826384d391ccc8c9d78a" +checksum = "46c0cbc34768ea17ea9475dd1bcd921f51d661a8542f00174d5279bc0357107a" dependencies = [ "env_logger", - "gear-core 1.4.0", + "gear-core", "hex", "nonempty", "parity-scale-codec", @@ -3035,18 +3136,18 @@ checksum = "bbfbfa701dc65e683fcd2fb24f046bcef22634acbdf47ad14724637dc39ad05b" [[package]] name = "gear-wasm-builder" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f53ac192c4ac7df34729e16672d205996a1b545392d21cc5d53928c02f7b42d5" +checksum = "a5c3b3bb4a9f3ac450826af22380b0b0876c47a2f74a6482676c2f96a1c8ac35" dependencies = [ "anyhow", "cargo_metadata", "chrono", "colored", "dirs", - "gear-core 1.4.0", + "gear-core", "gear-pwasm-utils", - "gear-wasm-instrument 1.4.0", + "gear-wasm-instrument", "gmeta", "log", "once_cell", @@ -3061,19 +3162,9 @@ dependencies = [ [[package]] name = "gear-wasm-instrument" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" -dependencies = [ - "derive_more", - "enum-iterator 1.5.0", - "gwasm-instrument", -] - -[[package]] -name = "gear-wasm-instrument" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73998852dfdfc2a5ba132961f5c7473a111b644a6a1c833927568fafdee4ec5c" +checksum = "6c4916f703d66a1707b6da29baeefae7f4bd06b0a61f0af82b9a6ec8db0a9d48" dependencies = [ "derive_more", "enum-iterator 1.5.0", @@ -3165,9 +3256,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -3177,11 +3268,11 @@ checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" [[package]] name = "gmeta" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90947c66a9f062c0e81625680e15177ecfca09cbea143aa0ec9fd75c1a170b55" +checksum = "82d4fbb3700df8abeed1753ca211be90d9ae7eba772dee1b097f2e6c0ac27871" dependencies = [ - "blake2-rfc", + "blake2", "derive_more", "gmeta-codegen", "hex", @@ -3190,13 +3281,87 @@ dependencies = [ [[package]] name = "gmeta-codegen" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c8458241d02077ca48b133b054f0dd20162bdf3a8ab39b6e4a52c7fabed124" +checksum = "54280c1b89114b9b6490246e1df64dcb4d8bd1a8fabb3885e954677a439f9179" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", +] + +[[package]] +name = "gp-allocator" +version = "4.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93cfb4525b5362966a1971125ff8f9825e6a511403635dccf883273d20c43bdf" +dependencies = [ + "log", + "parity-scale-codec", + "sp-wasm-interface-common", + "thiserror", +] + +[[package]] +name = "gp-runtime-interface" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dfb3786bf8fe51099c67dfe7c9a925fe0bfb78ffe938aa07b598995ee48d0e3" +dependencies = [ + "bytes", + "gp-runtime-interface-proc-macro", + "gp-wasm-interface", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.20.0", + "sp-std 9.0.0", + "sp-storage 14.0.0", + "sp-tracing 10.0.0", + "static_assertions", +] + +[[package]] +name = "gp-runtime-interface-proc-macro" +version = "12.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1e4d907f86db64e8b9d9af0b5adfd59e62b4023fd88511e13d62028ed101f2c" +dependencies = [ + "Inflector", + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "gp-wasm-interface" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de334e40147f969276463ad04d0ddfe519aebb6254832ea0637a300c6d637c11" +dependencies = [ + "anyhow", + "gp-allocator", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 9.0.0", + "sp-wasm-interface-common", + "wasmtime", +] + +[[package]] +name = "gprimitives" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be08df9284de8c1947d32da6f752c788f178be46f066386c36a204540cf24eb7" +dependencies = [ + "derive_more", + "gear-ss58", + "hex", + "parity-scale-codec", + "primitive-types", + "scale-info", ] [[package]] @@ -3212,18 +3377,18 @@ dependencies = [ [[package]] name = "gsdk" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11e173dbdb71767fd126338f37de5806241bd3ba045271907a70383da394ed0" +checksum = "1e19a8a4381d9a7d37f679edd51bd990415ded91fc7568ec2a539dd20d69dcaf" dependencies = [ "anyhow", "base64 0.21.7", "colored", "futures", "futures-util", - "gear-core 1.4.0", - "gear-core-errors 1.4.0", - "gear-utils 1.4.0", + "gear-core", + "gear-core-errors", + "gear-utils", "gsdk-codegen", "hex", "indexmap 2.2.6", @@ -3237,83 +3402,82 @@ dependencies = [ "serde", "serde_json", "sp-core 22.0.0", - "sp-runtime 25.0.0", + "sp-runtime", "subxt", "thiserror", ] [[package]] name = "gsdk-codegen" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7bbc39ccad58dca856c94d3eb9ee1d093482f55191df1abc09bcfdeb5000a8" +checksum = "af39fef52eee02b0b96c0fc8a8e6630be2a3af2edb79c77420631705ff7cbf8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "gstd" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "299badae4a9e90af8712199597fd7a95881b3d3ec56e09378943f93d7624aaf6" +checksum = "3c58b77baf767e90f5d11dc42cf1be867ff9a33e6c555b5184505e306b66eb79" dependencies = [ "arrayvec 0.7.4", "const_format", "futures", "galloc", "gcore", - "gear-core-errors 1.4.0", + "gear-core-errors", "gstd-codegen", "hashbrown 0.14.5", "hex", "parity-scale-codec", - "primitive-types", "scale-info", ] [[package]] name = "gstd-codegen" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23b09c3cc2b715b046453d57f58fe25ae20ebb1c441cf3ee9ee2a59f68a960d" +checksum = "2820ff3e8a5ea3e676374928587723a2b90162200351bac704123a1bb2e692bd" dependencies = [ - "gear-ss58", - "hex", + "gprimitives", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "gsys" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" - -[[package]] -name = "gsys" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fb4dcb5347292fcb6866a5338d7bca14bfe95a6e3a01cb7a6e7e8fe3a07022" +checksum = "4cea2fa86657d54507ee30862d8f5249c1f2f7bb3ccd5ce3b19a34982fd7fa42" [[package]] name = "gtest" -version = "1.1.0" -source = "git+https://github.com/gear-tech/gear?tag=v1.1.0#c8c09fc84385c17a1327033833acaba6a5a0d416" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0d524f69a40d609c854afcae42213c432bc05218df1b353114a34201e51737" dependencies = [ + "cargo_toml", "colored", + "core-processor", "derive_more", "env_logger", - "gear-core 1.1.0", - "gear-core-errors 1.1.0", - "gear-core-processor", + "etc", + "gear-common", + "gear-core", + "gear-core-errors", "gear-lazy-pages", "gear-lazy-pages-common", - "gear-utils 1.1.0", - "gear-wasm-instrument 1.1.0", - "gsys 1.1.0", + "gear-lazy-pages-native-interface", + "gear-utils", + "gear-wasm-instrument", + "gsys", "hex", + "indexmap 2.2.6", "log", "parity-scale-codec", "path-clean", @@ -3329,6 +3493,33 @@ dependencies = [ "gear-wasm", ] +[[package]] +name = "gwasmi" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "540bef71ad072d770140dc3f47f6bcc2b2b0492aa6a3ff236a13a7cd9427c58b" +dependencies = [ + "gwasmi_core", + "intx", + "smallvec", + "spin", + "wasmi_arena", + "wasmparser-nostd", +] + +[[package]] +name = "gwasmi_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47443d9a0eaa456c80525cebb42178fc47690fee77f9729eeece6ff70906fdcf" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", + "region", +] + [[package]] name = "h2" version = "0.3.26" @@ -3413,6 +3604,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -3441,7 +3638,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac 0.11.0", "digest 0.9.0", ] @@ -3531,9 +3728,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -3549,9 +3746,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3628,7 +3825,7 @@ dependencies = [ "identity-io", "identity-state", "sha2 0.10.8", - "sp-core 22.0.0", + "sp-core 21.0.0", ] [[package]] @@ -3726,9 +3923,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -3754,7 +3951,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -3765,7 +3962,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.52.0", ] @@ -4007,9 +4204,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "leb128" @@ -4019,9 +4216,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.154" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libc-print" @@ -4054,7 +4251,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -4120,9 +4317,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -4136,9 +4333,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "loupe" @@ -4194,7 +4391,7 @@ dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -4208,7 +4405,7 @@ dependencies = [ "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -4219,7 +4416,7 @@ checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -4230,7 +4427,7 @@ checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -4244,9 +4441,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memfd" @@ -4340,22 +4537,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4420,13 +4618,13 @@ name = "nft" version = "1.1.0" dependencies = [ "gclient", - "gear-core 1.4.0", + "gear-core", "gear-wasm-builder", "gmeta", "gstd", "gtest", "nft-io", - "sp-core 22.0.0", + "sp-core 21.0.0", "tokio", ] @@ -4605,7 +4803,7 @@ dependencies = [ "hex-literal", "non-fungible-token-io", "primitive-types", - "sp-core 22.0.0", + "sp-core 21.0.0", "sp-core-hashing 10.0.0", "tokio", ] @@ -4639,9 +4837,9 @@ checksum = "aeaf4ad7403de93e699c191202f017118df734d3850b01e13a3a8b2e6953d3c9" [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -4692,7 +4890,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -4713,14 +4911,14 @@ checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "numerated" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a46da4b4bdf9f956ca5aed5f0a2a93680baf3c4df2d0dceb3303154435f23800" +checksum = "4b8ba7cd770cf9c8fe653054e72ee8b89ee8a9a95eaf23e9f5c993c9ec32123d" dependencies = [ "derive_more", "num-traits", @@ -4754,9 +4952,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -4926,11 +5124,6 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" -[[package]] -name = "parity-wasm" -version = "0.45.0" -source = "git+https://github.com/gear-tech/parity-wasm?branch=v0.45.0-sign-ext#bad3e1ec78f655f3eec5a0c9c12a3546c8c9d432" - [[package]] name = "parking" version = "2.2.0" @@ -4939,9 +5132,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4957,7 +5150,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4984,7 +5177,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac 0.11.0", ] [[package]] @@ -5028,7 +5221,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -5072,9 +5265,9 @@ dependencies = [ [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand 2.1.0", @@ -5091,12 +5284,6 @@ dependencies = [ "spki", ] -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - [[package]] name = "polling" version = "2.8.0" @@ -5115,13 +5302,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix 0.38.34", "tracing", @@ -5158,13 +5345,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "prettier-please" -version = "0.2.0" +name = "prettyplease" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22020dfcf177fcc7bf5deaf7440af371400c67c0de14c399938d8ed4fb4645d3" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -5231,14 +5418,14 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -5389,11 +5576,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5424,7 +5611,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -5440,14 +5627,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -5461,13 +5648,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[package]] @@ -5478,9 +5665,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "region" @@ -5517,7 +5704,7 @@ dependencies = [ "hex-literal", "primitive-types", "rentable-nft-io", - "sp-core 22.0.0", + "sp-core 21.0.0", "sp-core-hashing 10.0.0", "tokio", ] @@ -5805,10 +5992,10 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -5857,9 +6044,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ruzstd" @@ -6002,9 +6189,9 @@ dependencies = [ [[package]] name = "schnellru" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0cf7da6fc4477944d5529807234f66802fcb618fc62b9c05bedca7f9be6c43" +checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" dependencies = [ "ahash 0.8.11", "cfg-if", @@ -6053,7 +6240,7 @@ checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" dependencies = [ "arrayref", "arrayvec 0.7.4", - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "getrandom_or_panic", "merlin 3.0.0", "rand_core 0.6.4", @@ -6127,11 +6314,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6140,9 +6327,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -6159,38 +6346,38 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.201" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -6199,9 +6386,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -6279,7 +6466,7 @@ dependencies = [ "sharded-fungible-token-logic", "sharded-fungible-token-logic-io", "sharded-fungible-token-storage", - "sp-core 22.0.0", + "sp-core 21.0.0", "sp-core-hashing 10.0.0", ] @@ -6533,7 +6720,7 @@ dependencies = [ "soketto", "tiny-keccak", "twox-hash", - "wasmi 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmi 0.30.0", ] [[package]] @@ -6574,7 +6761,7 @@ dependencies = [ "aes-gcm", "blake2", "chacha20poly1305", - "curve25519-dalek 4.1.2", + "curve25519-dalek 4.1.3", "rand_core 0.6.4", "rustc_version", "sha2 0.10.8", @@ -6616,42 +6803,33 @@ dependencies = [ "sha-1", ] -[[package]] -name = "sp-allocator" -version = "4.1.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "log", - "parity-scale-codec", - "sp-wasm-interface-common", - "thiserror", -] - [[package]] name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aa63dcdd3fb081a894189f83115dd683be1339a919cd7d3f98f145d1870626c" dependencies = [ "hash-db", "log", "parity-scale-codec", "scale-info", "sp-api-proc-macro", - "sp-core 21.0.0", - "sp-externalities 0.19.0", + "sp-core 22.0.0", + "sp-externalities 0.20.0", "sp-metadata-ir", - "sp-runtime 24.0.0", - "sp-state-machine 0.28.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "sp-trie 22.0.0", + "sp-runtime", + "sp-state-machine", + "sp-std 9.0.0", + "sp-trie", "sp-version", "thiserror", ] [[package]] name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a062dfff051064bfa1837566b74d00a49050b36e3887b2283ab667cef4f3a85e" dependencies = [ "Inflector", "blake2", @@ -6659,20 +6837,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.61", -] - -[[package]] -name = "sp-application-crypto" -version = "23.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "syn 2.0.72", ] [[package]] @@ -6685,24 +6850,10 @@ dependencies = [ "scale-info", "serde", "sp-core 22.0.0", - "sp-io 24.0.0", + "sp-io", "sp-std 9.0.0", ] -[[package]] -name = "sp-arithmetic" -version = "16.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "static_assertions", -] - [[package]] name = "sp-arithmetic" version = "17.0.0" @@ -6721,46 +6872,33 @@ dependencies = [ [[package]] name = "sp-core" version = "21.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f18d9e2f67d8661f9729f35347069ac29d92758b59135176799db966947a7336" dependencies = [ - "array-bytes", + "array-bytes 4.2.0", "bitflags 1.3.2", "blake2", "bounded-collections", - "bs58 0.4.0", - "dyn-clonable", "ed25519-zebra", - "futures", "hash-db", "hash256-std-hasher", - "impl-serde", - "lazy_static", "libsecp256k1", "log", "merlin 2.0.1", "parity-scale-codec", - "parking_lot", "paste", "primitive-types", - "rand 0.8.5", - "regex", "scale-info", "schnorrkel 0.9.1", "secp256k1", "secrecy", - "serde", - "sp-allocator", - "sp-core-hashing 9.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-core-hashing 9.0.0", "sp-debug-derive 8.0.0", "sp-externalities 0.19.0", "sp-runtime-interface 17.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0", "sp-storage 13.0.0", "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "tracing", "zeroize", ] @@ -6770,7 +6908,7 @@ version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0de478e02efd547693b33ad02515e09933d5b69b7f3036fa890b92e50fd9dfc" dependencies = [ - "array-bytes", + "array-bytes 6.2.3", "bitflags 1.3.2", "blake2", "bounded-collections", @@ -6821,20 +6959,7 @@ dependencies = [ "digest 0.10.7", "sha2 0.10.8", "sha3", - "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "twox-hash", -] - -[[package]] -name = "sp-core-hashing" -version = "9.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", + "sp-std 8.0.0", "twox-hash", ] @@ -6854,22 +6979,24 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" -version = "9.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dc707d9f5bf155d584900783e328cb3dc79c950f898a18a8f24066f41f040a5" dependencies = [ "quote", - "sp-core-hashing 9.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "syn 2.0.61", + "sp-core-hashing 10.0.0", + "syn 2.0.72", ] [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f531814d2f16995144c74428830ccf7d94ff4a7749632b83ad8199b181140c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -6880,17 +7007,18 @@ checksum = "f12dae7cf6c1e825d13ffd4ce16bd9309db7c539929d0302b4443ed451a9f4e5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f71c671e01a8ca60da925d43a1b351b69626e268b8837f8371e320cf1dd100" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0", "sp-storage 13.0.0", ] @@ -6908,43 +7036,19 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30fe27930fbcc1ddf8e73446c65b2696f3544adeb30d1f5171d360e5c7072c9c" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime 24.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-runtime", + "sp-std 9.0.0", "thiserror", ] -[[package]] -name = "sp-io" -version = "23.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "bytes", - "ed25519", - "ed25519-dalek", - "libsecp256k1", - "log", - "parity-scale-codec", - "rustversion", - "secp256k1", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-keystore 0.27.0", - "sp-runtime-interface 17.0.0", - "sp-state-machine 0.28.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "sp-tracing 10.0.0", - "sp-trie 22.0.0", - "tracing", - "tracing-core", -] - [[package]] name = "sp-io" version = "24.0.0" @@ -6961,28 +7065,16 @@ dependencies = [ "secp256k1", "sp-core 22.0.0", "sp-externalities 0.20.0", - "sp-keystore 0.28.0", + "sp-keystore", "sp-runtime-interface 18.0.0", - "sp-state-machine 0.29.0", + "sp-state-machine", "sp-std 9.0.0", "sp-tracing 11.0.0", - "sp-trie 23.0.0", + "sp-trie", "tracing", "tracing-core", ] -[[package]] -name = "sp-keystore" -version = "0.27.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "parity-scale-codec", - "parking_lot", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "thiserror", -] - [[package]] name = "sp-keystore" version = "0.28.0" @@ -6999,22 +7091,13 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369e75e418bcfdeede4acb92563ef2d514ad0e7d81c350ba9ae98841a237f3c" dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", -] - -[[package]] -name = "sp-panic-handler" -version = "8.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "backtrace", - "lazy_static", - "regex", + "sp-std 9.0.0", ] [[package]] @@ -7028,28 +7111,6 @@ dependencies = [ "regex", ] -[[package]] -name = "sp-runtime" -version = "24.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand 0.8.5", - "scale-info", - "serde", - "sp-application-crypto 23.0.0", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-io 23.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "sp-weights 20.0.0", -] - [[package]] name = "sp-runtime" version = "25.0.0" @@ -7065,18 +7126,19 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-application-crypto 24.0.0", - "sp-arithmetic 17.0.0", + "sp-application-crypto", + "sp-arithmetic", "sp-core 22.0.0", - "sp-io 24.0.0", + "sp-io", "sp-std 9.0.0", - "sp-weights 21.0.0", + "sp-weights", ] [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e676128182f90015e916f806cba635c8141e341e7abbc45d25525472e1bbce8" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -7084,7 +7146,7 @@ dependencies = [ "primitive-types", "sp-externalities 0.19.0", "sp-runtime-interface-proc-macro 11.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0", "sp-storage 13.0.0", "sp-tracing 10.0.0", "sp-wasm-interface 14.0.0", @@ -7113,13 +7175,14 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d5bd5566fe5633ec48dfa35ab152fd29f8a577c21971e1c6db9f28afb9bbb9" dependencies = [ "Inflector", "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -7132,42 +7195,22 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4883e5d0a533009175746e3c35d44aa031805064153749baefd6cac915e70ba5" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", - "sp-core 21.0.0", - "sp-runtime 24.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", -] - -[[package]] -name = "sp-state-machine" -version = "0.28.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot", - "rand 0.8.5", - "smallvec", - "sp-core 21.0.0", - "sp-externalities 0.19.0", - "sp-panic-handler 8.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "sp-trie 22.0.0", - "thiserror", - "tracing", - "trie-db", + "sp-core 22.0.0", + "sp-runtime", + "sp-std 9.0.0", ] [[package]] @@ -7184,9 +7227,9 @@ dependencies = [ "smallvec", "sp-core 22.0.0", "sp-externalities 0.20.0", - "sp-panic-handler 9.0.0", + "sp-panic-handler", "sp-std 9.0.0", - "sp-trie 23.0.0", + "sp-trie", "thiserror", "tracing", "trie-db", @@ -7198,11 +7241,6 @@ version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d" -[[package]] -name = "sp-std" -version = "8.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" - [[package]] name = "sp-std" version = "9.0.0" @@ -7212,14 +7250,15 @@ checksum = "2d5bbc9339227d1b6a9b7ccd9b2920c818653d40eef1512f1e2e824d72e7a336" [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94294be83f11d4958cfea89ed5798f0b6605f5defc3a996948848458abbcc18e" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", "sp-debug-derive 8.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0", ] [[package]] @@ -7239,10 +7278,11 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357f7591980dd58305956d32f8f6646d0a8ea9ea0e7e868e46f53b68ddf00cec" dependencies = [ "parity-scale-codec", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 8.0.0", "tracing", "tracing-core", "tracing-subscriber", @@ -7261,29 +7301,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "sp-trie" -version = "22.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "ahash 0.8.11", - "hash-db", - "hashbrown 0.13.2", - "lazy_static", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot", - "scale-info", - "schnellru", - "sp-core 21.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "thiserror", - "tracing", - "trie-db", - "trie-root", -] - [[package]] name = "sp-trie" version = "23.0.0" @@ -7310,45 +7327,43 @@ dependencies = [ [[package]] name = "sp-version" -version = "22.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "23.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccae066042a53a83017a2afeee2fd608efa42b564c1a44ea1260d5a2c264ac66" dependencies = [ "impl-serde", "parity-scale-codec", - "parity-wasm 0.45.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-wasm", "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime 24.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-runtime", + "sp-std 9.0.0", "sp-version-proc-macro", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "8.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e569853a50ad02a4b45640e7b96206bcb4569bb85ce7cdf8754a207fcfba54" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19c122609ca5d8246be6386888596320d03c7bc880959eaa2c36bcd5acd6846" dependencies = [ - "anyhow", "impl-trait-for-tuples", - "log", "parity-scale-codec", - "sp-allocator", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", - "sp-wasm-interface-common", - "wasmtime", + "sp-std 8.0.0", ] [[package]] @@ -7367,29 +7382,15 @@ dependencies = [ [[package]] name = "sp-wasm-interface-common" -version = "7.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03223ee788e1490f6341eb5b76501f83abf931fa8b5d83b5f49a4fecaf83f4ae" dependencies = [ "parity-scale-codec", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", + "sp-std 9.0.0", "wasmi 0.13.2", ] -[[package]] -name = "sp-weights" -version = "20.0.0" -source = "git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary#01d999dab4c70a4120084c21f6acad4bf2791f65" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 16.0.0", - "sp-core 21.0.0", - "sp-debug-derive 8.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/substrate.git?branch=gear-polkadot-v1.0.0-canary)", -] - [[package]] name = "sp-weights" version = "21.0.0" @@ -7400,7 +7401,7 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic 17.0.0", + "sp-arithmetic", "sp-core 22.0.0", "sp-debug-derive 9.0.0", "sp-std 9.0.0", @@ -7494,6 +7495,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "student-nft" version = "1.1.0" @@ -7539,9 +7546,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "subtle-ng" @@ -7574,7 +7581,7 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core-hashing 9.0.0", "subxt-lightclient", "subxt-macro", "subxt-metadata", @@ -7597,7 +7604,7 @@ dependencies = [ "quote", "scale-info", "subxt-metadata", - "syn 2.0.61", + "syn 2.0.72", "thiserror", "tokio", ] @@ -7625,10 +7632,10 @@ version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12e8be9ab6fe88b8c13edbe15911e148482cfb905a8b8d5b8d766a64c54be0bd" dependencies = [ - "darling 0.20.8", + "darling 0.20.10", "proc-macro-error", "subxt-codegen", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -7640,7 +7647,7 @@ dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core-hashing 9.0.0", "thiserror", ] @@ -7715,9 +7722,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.61" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -7830,9 +7837,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "tempfile" @@ -7878,9 +7885,9 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] @@ -7902,18 +7909,18 @@ checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -7931,7 +7938,7 @@ name = "tic-tac-toe" version = "1.1.0" dependencies = [ "gclient", - "gear-core 1.4.0", + "gear-core", "gear-wasm-builder", "gmeta", "gstd", @@ -7982,9 +7989,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7997,30 +8004,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -8060,21 +8066,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit 0.22.16", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -8103,15 +8109,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.12" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.15", ] [[package]] @@ -8161,7 +8167,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] @@ -8281,6 +8287,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uluru" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c8a2469e56e6e5095c82ccd3afb98dad95f7af7929aab6d8ba8d6e0f73657da" +dependencies = [ + "arrayvec 0.7.4", +] + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -8304,9 +8319,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -8332,9 +8347,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -8343,9 +8358,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "valuable" @@ -8361,12 +8376,12 @@ dependencies = [ "fungible-token", "fungible-token-io", "gclient", - "gear-core 1.4.0", + "gear-core", "gear-wasm-builder", "gstd", "gtest", "hex", - "sp-core 22.0.0", + "sp-core 21.0.0", "tokio", "vara-man-io", ] @@ -8387,7 +8402,7 @@ version = "1.1.0" dependencies = [ "fungible-token", "fungible-token-io", - "gear-core 1.4.0", + "gear-core", "gear-wasm-builder", "gstd", "gtest", @@ -8453,9 +8468,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "want" @@ -8499,7 +8514,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -8521,7 +8536,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8534,9 +8549,9 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-encoder" -version = "0.207.0" +version = "0.214.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d996306fb3aeaee0d9157adbe2f670df0236caf19f6728b221e92d0f27b3fe17" +checksum = "ff694f02a8d7a50b6922b197ae03883fbf18cdb2ae9fbee7b6148456f5f44041" dependencies = [ "leb128", ] @@ -8807,9 +8822,10 @@ dependencies = [ [[package]] name = "wasmi" version = "0.13.2" -source = "git+https://github.com/gear-tech/wasmi?branch=v0.13.2-sign-ext#3a0b1022377919e62aadf4d78b762abd1c3e9a04" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" dependencies = [ - "parity-wasm 0.45.0 (git+https://github.com/gear-tech/parity-wasm?branch=v0.45.0-sign-ext)", + "parity-wasm", "wasmi-validation", "wasmi_core 0.2.1", ] @@ -8823,37 +8839,20 @@ dependencies = [ "intx", "smallvec", "spin", - "wasmi_arena 0.4.1", - "wasmi_core 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmparser-nostd", -] - -[[package]] -name = "wasmi" -version = "0.30.0" -source = "git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0#c8b0be9c2012e0478959a59074fd953a942782bc" -dependencies = [ - "intx", - "smallvec", - "spin", - "wasmi_arena 0.4.0", - "wasmi_core 0.12.0 (git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0)", + "wasmi_arena", + "wasmi_core 0.12.0", "wasmparser-nostd", ] [[package]] name = "wasmi-validation" version = "0.5.0" -source = "git+https://github.com/gear-tech/wasmi?branch=v0.13.2-sign-ext#3a0b1022377919e62aadf4d78b762abd1c3e9a04" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" dependencies = [ - "parity-wasm 0.45.0 (git+https://github.com/gear-tech/parity-wasm?branch=v0.45.0-sign-ext)", + "parity-wasm", ] -[[package]] -name = "wasmi_arena" -version = "0.4.0" -source = "git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0#c8b0be9c2012e0478959a59074fd953a942782bc" - [[package]] name = "wasmi_arena" version = "0.4.1" @@ -8863,7 +8862,8 @@ checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" [[package]] name = "wasmi_core" version = "0.2.1" -source = "git+https://github.com/gear-tech/wasmi?branch=v0.13.2-sign-ext#3a0b1022377919e62aadf4d78b762abd1c3e9a04" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", "libm", @@ -8885,18 +8885,6 @@ dependencies = [ "paste", ] -[[package]] -name = "wasmi_core" -version = "0.12.0" -source = "git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0#c8b0be9c2012e0478959a59074fd953a942782bc" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", - "region", -] - [[package]] name = "wasmparser" version = "0.83.0" @@ -9056,9 +9044,9 @@ dependencies = [ [[package]] name = "wast" -version = "207.0.0" +version = "214.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e40be9fd494bfa501309487d2dc0b3f229be6842464ecbdc54eac2679c84c93" +checksum = "694bcdb24c49c8709bd8713768b71301a11e823923eee355d530f1d8d0a7f8e9" dependencies = [ "bumpalo", "leb128", @@ -9069,9 +9057,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.207.0" +version = "1.214.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb2b15e2d5f300f5e1209e7dc237f2549edbd4203655b6c6cab5cf180561ee7" +checksum = "347249eb56773fa728df2656cfe3a8c19437ded61a922a0b5e0839d9790e278e" dependencies = [ "wast", ] @@ -9131,7 +9119,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -9171,7 +9159,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -9206,18 +9194,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -9234,9 +9222,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -9258,9 +9246,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -9282,15 +9270,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -9312,9 +9300,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -9336,9 +9324,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -9354,9 +9342,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -9378,9 +9366,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -9393,9 +9381,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0" dependencies = [ "memchr", ] @@ -9440,29 +9428,29 @@ checksum = "ff4524214bc4629eba08d78ceb1d6507070cc0bcbbed23af74e19e6e924a24cf" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -9475,5 +9463,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.72", ] diff --git a/contracts/Cargo.toml b/contracts/Cargo.toml index f4960dc3d..197797980 100644 --- a/contracts/Cargo.toml +++ b/contracts/Cargo.toml @@ -14,8 +14,6 @@ members = [ "dao/state", "dao-light", "dao-light/state", - "ddns", - "ddns/state", "decentralized-git", "decentralized-git/master", "decentralized-git/master/state", @@ -161,7 +159,6 @@ concert-io.path = "concert/io" crowdsale-io.path = "crowdsale/io" dao-io.path = "dao/io" dao-light-io.path = "dao-light/io" -ddns-io.path = "ddns/io" decentralized-git-io.path = "decentralized-git/io" decentralized-git-master-io.path = "decentralized-git/master/io" decentralized-git-user-io.path = "decentralized-git/user/io" @@ -228,13 +225,13 @@ gstd = "1.4.2" gear-wasm-builder = "1.4.2" gmeta = "1.4.2" gclient = "1.4.2" -gtest = { git = "https://github.com/gear-tech/gear", tag = "v1.4.2" } +gtest = "1.4.2" gear-core = "1.4.2" # External primitive-types = { version = "0.12", default-features = false } -sp-core = { version = "22", default-features = false, features = ["full_crypto", "sp-externalities"] } +sp-core = { version = "21.0.0", default-features = false, features = ["full_crypto", "sp-externalities"] } sp-core-hashing = { version = "10", default-features = false } tokio = "1" blake2-rfc = "0.2" diff --git a/contracts/auto-changed-nft/tests/nft_tests.rs b/contracts/auto-changed-nft/tests/nft_tests.rs index 1ad417276..1734808c5 100644 --- a/contracts/auto-changed-nft/tests/nft_tests.rs +++ b/contracts/auto-changed-nft/tests/nft_tests.rs @@ -14,7 +14,7 @@ const ZERO_ID: u64 = 0; fn mint_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); let message = NFTEvent::Transfer(NFTTransfer { @@ -50,7 +50,7 @@ fn mint_limit_exceed() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -83,7 +83,7 @@ fn mint_authorized() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -116,7 +116,7 @@ fn mint_not_authorized() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -149,7 +149,7 @@ fn mint_added() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = add_minter(&nft, transaction_id, USERS[1].into(), USERS[0]); assert!(!res.main_failed()); @@ -164,7 +164,7 @@ fn mint_added() { fn burn_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -182,7 +182,7 @@ fn burn_success() { fn burn_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); // must fail since the token doesn't exist @@ -197,7 +197,7 @@ fn burn_failures() { fn transfer_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -215,7 +215,7 @@ fn transfer_success() { fn transfer_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); @@ -234,7 +234,7 @@ fn transfer_failures() { fn owner_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -253,7 +253,7 @@ fn owner_success() { fn is_approved_to_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -284,7 +284,7 @@ fn is_approved_to_success() { fn is_approved_to_failure() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -298,7 +298,7 @@ fn is_approved_to_failure() { fn approve_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -318,7 +318,7 @@ fn approve_success() { fn auto_change_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); @@ -373,7 +373,7 @@ fn auto_change_success() { fn approve_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -401,7 +401,7 @@ fn approve_failures() { fn delegated_approve_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let pair = Sr25519Pair::from_seed(&hex!( "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60" )); @@ -436,7 +436,7 @@ fn delegated_approve_success() { fn delegated_approve_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let pair = Sr25519Pair::from_seed(&hex!( "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60" )); @@ -475,7 +475,7 @@ fn delegated_approve_failures() { assert!(delegated_approve(&nft, transaction_id, USERS[0], message, signature.0).main_failed()); // Must fail if user tries to approve token in wrong contract init_nft(&sys); - let second_nft = sys.get_program(2); + let second_nft = sys.get_program(2).unwrap(); transaction_id += 1; assert!(!add_minter(&second_nft, transaction_id, owner_id.into(), USERS[0]).main_failed()); transaction_id += 1; diff --git a/contracts/auto-changed-nft/tests/node_tests.rs b/contracts/auto-changed-nft/tests/node_tests.rs index 5b3451d17..a7895edbb 100644 --- a/contracts/auto-changed-nft/tests/node_tests.rs +++ b/contracts/auto-changed-nft/tests/node_tests.rs @@ -412,7 +412,13 @@ async fn gclient_auto_changed() -> Result<()> { name: String::from("MyToken"), description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + // let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, diff --git a/contracts/battleship/tests/test.rs b/contracts/battleship/tests/test.rs index 1a0cd86cb..b2e869e5c 100644 --- a/contracts/battleship/tests/test.rs +++ b/contracts/battleship/tests/test.rs @@ -37,7 +37,7 @@ fn failures_location_ships() { let system = System::new(); system.init_logger(); init_battleship(&system); - let battleship = system.get_program(1); + let battleship = system.get_program(1).unwrap(); // outfield let ships = Ships { ship_1: vec![27], @@ -140,7 +140,7 @@ fn failures_test() { let system = System::new(); system.init_logger(); init_battleship(&system); - let battleship = system.get_program(1); + let battleship = system.get_program(1).unwrap(); // the game hasn't started let res = battleship.send( @@ -255,7 +255,7 @@ fn success_test() { let system = System::new(); system.init_logger(); init_battleship(&system); - let battleship = system.get_program(1); + let battleship = system.get_program(1).unwrap(); let ships = Ships { ship_1: vec![19], ship_2: vec![0, 1, 2], @@ -302,7 +302,7 @@ fn create_session_success() { let system = System::new(); system.init_logger(); init_battleship(&system); - let battleship = system.get_program(1); + let battleship = system.get_program(1).unwrap(); let main_account = 3; let proxy_account = 10; @@ -340,7 +340,7 @@ fn create_session_failures() { let system = System::new(); system.init_logger(); init_battleship(&system); - let battleship = system.get_program(1); + let battleship = system.get_program(1).unwrap(); // The session duration is too long: the number of blocks is greater than u32::MAX. let number_of_blocks = u32::MAX as u64 + 1; @@ -440,7 +440,7 @@ fn session_deletion_on_expiration() { let system = System::new(); system.init_logger(); init_battleship(&system); - let battleship = system.get_program(1); + let battleship = system.get_program(1).unwrap(); let main_account = 3; let proxy_account = 10; @@ -483,7 +483,7 @@ fn disallow_game_without_required_actions() { let proxy_account = 10; init_battleship(&system); - let battleship = system.get_program(1); + let battleship = system.get_program(1).unwrap(); let duration = MINIMUM_SESSION_SURATION_MS; let session = Session { @@ -610,7 +610,7 @@ fn complete_session_game() { let proxy_account = 10; init_battleship(&system); - let battleship = system.get_program(1); + let battleship = system.get_program(1).unwrap(); let duration = MINIMUM_SESSION_SURATION_MS; let session = Session { @@ -701,7 +701,7 @@ fn premature_session_deletion_by_user() { let proxy_account = 10; init_battleship(&system); - let battleship = system.get_program(1); + let battleship = system.get_program(1).unwrap(); let duration = MINIMUM_SESSION_SURATION_MS; let session = Session { diff --git a/contracts/crowdsale/tests/balance_tests.rs b/contracts/crowdsale/tests/balance_tests.rs index f726283cb..6cd7aeeca 100644 --- a/contracts/crowdsale/tests/balance_tests.rs +++ b/contracts/crowdsale/tests/balance_tests.rs @@ -9,7 +9,7 @@ fn balance_after_two_purchases() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, (TIME_INCREASE_STEP + 1) as _, 0); @@ -37,7 +37,7 @@ fn owner_balance() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 1, 0); diff --git a/contracts/crowdsale/tests/buy_tokens_tests.rs b/contracts/crowdsale/tests/buy_tokens_tests.rs index 1f88846ec..2f983e98a 100644 --- a/contracts/crowdsale/tests/buy_tokens_tests.rs +++ b/contracts/crowdsale/tests/buy_tokens_tests.rs @@ -10,7 +10,7 @@ fn common_buy_tokens() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -23,7 +23,7 @@ fn buy_tokens_with_change() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -50,7 +50,7 @@ fn buy_tokens_after_price_update() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -89,7 +89,7 @@ fn buy_when_no_time_left() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -105,7 +105,7 @@ fn wrong_value_sent() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -119,7 +119,7 @@ fn wrong_value_after_price_update() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -139,7 +139,7 @@ fn all_tokens_bought() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -155,7 +155,7 @@ fn buy_before_start() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); let amount: u128 = 5; buy_tokens(&sys, &ico, amount, amount * START_PRICE); @@ -167,7 +167,7 @@ fn buy_after_end_sale() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -185,7 +185,7 @@ fn buy_more_than_goal_tokens() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -199,7 +199,7 @@ fn buy_too_many_tokens() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -216,7 +216,7 @@ fn buy_zero_tokens() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); @@ -230,7 +230,7 @@ fn overflowing_multiplication_buy() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); diff --git a/contracts/crowdsale/tests/end_sale_tests.rs b/contracts/crowdsale/tests/end_sale_tests.rs index c3aebaefc..4f857f7c7 100644 --- a/contracts/crowdsale/tests/end_sale_tests.rs +++ b/contracts/crowdsale/tests/end_sale_tests.rs @@ -11,7 +11,7 @@ fn end_sale_no_time_left() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 1, 0); @@ -25,7 +25,7 @@ fn end_sale_zero_tokens() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 1, 0); @@ -41,7 +41,7 @@ fn end_sale_time_and_tokens_left() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 1, 0); @@ -57,7 +57,7 @@ fn not_owner_end_sale() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 1, 0); @@ -74,7 +74,7 @@ fn end_sale_before_start() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); end_sale(&ico, 0); } @@ -85,7 +85,7 @@ fn end_sale_twice() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 1, 0); diff --git a/contracts/crowdsale/tests/init_ico/token.rs b/contracts/crowdsale/tests/init_ico/token.rs index 20d20493c..f670d8c7a 100644 --- a/contracts/crowdsale/tests/init_ico/token.rs +++ b/contracts/crowdsale/tests/init_ico/token.rs @@ -29,7 +29,7 @@ pub trait FToken { impl FToken for Program<'_> { fn ftoken(owner: u64, id: u64, system: &System) -> Program<'_> { - let ftoken = Program::from_file_with_id( + let ftoken = Program::from_binary_with_id( system, id, "../target/wasm32-unknown-unknown/debug/sharded_fungible_token.opt.wasm", diff --git a/contracts/crowdsale/tests/start_ico_tests.rs b/contracts/crowdsale/tests/start_ico_tests.rs index ee8e440ae..3b40a54eb 100644 --- a/contracts/crowdsale/tests/start_ico_tests.rs +++ b/contracts/crowdsale/tests/start_ico_tests.rs @@ -11,7 +11,7 @@ fn start_ico() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 2, 0); } @@ -22,7 +22,7 @@ fn not_owner_start_ico() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); let duration = Duration::from_secs(20).as_millis() as u64; let res = ico.send( @@ -57,7 +57,7 @@ fn second_start_ico() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 1, 0); start_sale(&ico, 1, 1); @@ -69,7 +69,7 @@ fn zero_duration_start_ico() { let sys = System::new(); init(&sys); - let ico = sys.get_program(2); + let ico = sys.get_program(2).unwrap(); start_sale(&ico, 0, 0); } diff --git a/contracts/dao-light/tests/dao_simple_test.rs b/contracts/dao-light/tests/dao_simple_test.rs index a6e666a86..2a653c176 100644 --- a/contracts/dao-light/tests/dao_simple_test.rs +++ b/contracts/dao-light/tests/dao_simple_test.rs @@ -10,8 +10,8 @@ fn deposit_tokens() { let sys = System::new(); init_fungible_token(&sys); init_dao(&sys); - let dao = sys.get_program(2); - assert!(!approve(&sys.get_program(1), MEMBERS[0], 2, 1000).main_failed()); + let dao = sys.get_program(2).unwrap(); + assert!(!approve(&sys.get_program(1).unwrap(), MEMBERS[0], 2, 1000).main_failed()); let res = deposit(&dao, MEMBERS[0], 1000); assert!(res.contains(&( MEMBERS[0], @@ -28,8 +28,8 @@ fn create_proposal() { let sys = System::new(); init_fungible_token(&sys); init_dao(&sys); - let ft = sys.get_program(1); - let dao = sys.get_program(2); + let ft = sys.get_program(1).unwrap(); + let dao = sys.get_program(2).unwrap(); assert!(!approve(&ft, MEMBERS[0], 2, 1000).main_failed()); assert!(!deposit(&dao, MEMBERS[0], 1000).main_failed()); let res = proposal(&dao, MEMBERS[0], MEMBERS[2], 800); @@ -62,8 +62,8 @@ fn create_proposal_failures() { let sys = System::new(); init_fungible_token(&sys); init_dao(&sys); - let ft = sys.get_program(1); - let dao = sys.get_program(2); + let ft = sys.get_program(1).unwrap(); + let dao = sys.get_program(2).unwrap(); assert!(!approve(&ft, MEMBERS[0], 2, 1000).main_failed()); assert!(!deposit(&dao, MEMBERS[0], 1000).main_failed()); // must fail since dao has not enough tokens for funding @@ -83,8 +83,8 @@ fn vote_on_proposal() { let sys = System::new(); init_fungible_token(&sys); init_dao(&sys); - let ft = sys.get_program(1); - let dao = sys.get_program(2); + let ft = sys.get_program(1).unwrap(); + let dao = sys.get_program(2).unwrap(); assert!(!approve(&ft, MEMBERS[0], 2, 1000).main_failed()); assert!(!approve(&ft, MEMBERS[1], 2, 1000).main_failed()); assert!(!deposit(&dao, MEMBERS[0], 1000).main_failed()); @@ -121,8 +121,8 @@ fn vote_on_proposal_failures() { init_fungible_token(&sys); init_dao(&sys); - let ft = sys.get_program(1); - let dao = sys.get_program(2); + let ft = sys.get_program(1).unwrap(); + let dao = sys.get_program(2).unwrap(); assert!(!approve(&ft, MEMBERS[0], 2, 1000).main_failed()); assert!(!approve(&ft, MEMBERS[1], 2, 1000).main_failed()); @@ -158,8 +158,8 @@ fn process_proposal() { init_fungible_token(&sys); init_dao(&sys); - let ft = sys.get_program(1); - let dao = sys.get_program(2); + let ft = sys.get_program(1).unwrap(); + let dao = sys.get_program(2).unwrap(); assert!(!approve(&ft, MEMBERS[0], 2, 1000).main_failed()); assert!(!approve(&ft, MEMBERS[1], 2, 2000).main_failed()); @@ -223,8 +223,8 @@ fn process_proposal_failures() { init_fungible_token(&sys); init_dao(&sys); - let ft = sys.get_program(1); - let dao = sys.get_program(2); + let ft = sys.get_program(1).unwrap(); + let dao = sys.get_program(2).unwrap(); assert!(!approve(&ft, MEMBERS[0], 2, 1000).main_failed()); assert!(!deposit(&dao, MEMBERS[0], 1000).main_failed()); @@ -251,8 +251,8 @@ fn ragequit_dao() { init_fungible_token(&sys); init_dao(&sys); - let ft = sys.get_program(1); - let dao = sys.get_program(2); + let ft = sys.get_program(1).unwrap(); + let dao = sys.get_program(2).unwrap(); assert!(!approve(&ft, MEMBERS[1], 2, 1000).main_failed()); assert!(!deposit(&dao, MEMBERS[1], 1000).main_failed()); @@ -307,8 +307,8 @@ fn ragequit_failures() { init_fungible_token(&sys); init_dao(&sys); - let ft = sys.get_program(1); - let dao = sys.get_program(2); + let ft = sys.get_program(1).unwrap(); + let dao = sys.get_program(2).unwrap(); assert!(!approve(&ft, MEMBERS[0], 2, 1000).main_failed()); assert!(!deposit(&dao, MEMBERS[0], 1000).main_failed()); diff --git a/contracts/dao/tests/utils_gclient/common.rs b/contracts/dao/tests/utils_gclient/common.rs index f046ee68a..70d34dd1e 100644 --- a/contracts/dao/tests/utils_gclient/common.rs +++ b/contracts/dao/tests/utils_gclient/common.rs @@ -24,8 +24,14 @@ pub async fn fund_applicants(api: &GearApi) -> gclient::Result<()> { for applicant in APPLICANTS { let id = get_user_to_actor_id(applicant).await?.encode(); - api.transfer_keep_alive(id.as_slice().into(), fund_amount) - .await?; + api.transfer_keep_alive( + id.as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + fund_amount, + ) + .await + .expect("Error transfer"); } Ok(()) diff --git a/contracts/ddns/Cargo.toml b/contracts/ddns/Cargo.toml deleted file mode 100644 index 924840b79..000000000 --- a/contracts/ddns/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "ddns" -version.workspace = true -edition.workspace = true -publish.workspace = true - -[dependencies] -gstd.workspace = true -ddns-io.workspace = true - -[build-dependencies] -gear-wasm-builder.workspace = true -ddns-io.workspace = true diff --git a/contracts/ddns/README.md b/contracts/ddns/README.md deleted file mode 100644 index 5ccdccd7f..000000000 --- a/contracts/ddns/README.md +++ /dev/null @@ -1,16 +0,0 @@ -[![Open in Gitpod](https://img.shields.io/badge/Open_in-Gitpod-white?logo=gitpod)](https://gitpod.io/#FOLDER=ddns/https://github.com/gear-foundation/dapps) -[![Docs](https://img.shields.io/github/actions/workflow/status/gear-foundation/dapps/contracts.yml?logo=rust&label=docs)](https://dapps.gear.rs/ddns_io) - -# [Decentralized DNS](https://wiki.gear-tech.io/docs/examples/Infra/dein) - -### 🏗️ Building - -```sh -cargo b -p "ddns*" -``` - -### ✅ Testing - -```sh -cargo t -p "ddns*" -``` diff --git a/contracts/ddns/build.rs b/contracts/ddns/build.rs deleted file mode 100644 index 0bc8c8033..000000000 --- a/contracts/ddns/build.rs +++ /dev/null @@ -1,5 +0,0 @@ -use ddns_io::ContractMetadata; - -fn main() { - gear_wasm_builder::build_with_metadata::(); -} diff --git a/contracts/ddns/io/Cargo.toml b/contracts/ddns/io/Cargo.toml deleted file mode 100644 index 1a38bbcad..000000000 --- a/contracts/ddns/io/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "ddns-io" -version.workspace = true -edition.workspace = true -publish.workspace = true - -[dependencies] -gstd.workspace = true -gmeta.workspace = true diff --git a/contracts/ddns/io/src/lib.rs b/contracts/ddns/io/src/lib.rs deleted file mode 100644 index 276d03dd9..000000000 --- a/contracts/ddns/io/src/lib.rs +++ /dev/null @@ -1,110 +0,0 @@ -#![no_std] - -use codec::{Decode, Encode}; -use gmeta::{InOut, Metadata, Out}; -use gstd::{prelude::*, ActorId, Clone, Vec}; -use scale_info::TypeInfo; - -pub struct ContractMetadata; - -impl Metadata for ContractMetadata { - type Init = (); - type Handle = InOut; - type Reply = (); - type Others = (); - type Signal = (); - type State = Out>; -} - -#[derive(Encode, Decode, TypeInfo, Clone)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] -pub struct DnsRecord { - pub id: ActorId, - pub meta: DnsMeta, - pub created_by: ActorId, -} - -#[derive(Encode, Decode, TypeInfo, Clone)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] -pub struct DnsMeta { - pub name: String, - pub link: String, - pub description: String, -} - -#[derive(Decode, Clone)] -#[codec(crate = gstd::codec)] -pub enum GetDnsMeta { - DnsMeta(Option), -} - -#[derive(Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] -pub enum DnsAction { - Register(ActorId), - Remove(ActorId), - Update(ActorId), - GetById(ActorId), - GetByName(String), - GetByDescription(String), -} - -#[derive(Encode, Decode, TypeInfo)] -#[codec(crate = gstd::codec)] -#[scale_info(crate = gstd::scale_info)] -pub enum DnsReply { - Record(Option), - Records(Vec), -} - -pub trait Dns { - fn get_by_id(&self, id: ActorId) -> Option; - - fn get_by_name(&self, name: String) -> Vec; - - fn get_by_description(&self, description: String) -> Vec; - - fn get_by_creator(&self, creator: ActorId) -> Vec; - - fn get_by_pattern(&self, pattern: String) -> Vec; -} - -impl Dns for Vec { - fn get_by_id(&self, id: ActorId) -> Option { - self.iter().find(|&r| r.id == id).cloned() - } - - fn get_by_name(&self, name: String) -> Vec { - self.iter() - .filter(|r| r.meta.name == name) - .cloned() - .collect() - } - - fn get_by_description(&self, description: String) -> Vec { - self.iter() - .filter(|&r| r.meta.description.as_str().contains(description.as_str())) - .cloned() - .collect() - } - - fn get_by_creator(&self, creator: ActorId) -> Vec { - self.iter() - .filter(|&r| r.created_by == creator) - .cloned() - .collect() - } - - fn get_by_pattern(&self, pattern: String) -> Vec { - self.iter() - .filter(|&r| { - r.meta.name.as_str().contains(pattern.as_str()) - || r.meta.description.as_str().contains(pattern.as_str()) - }) - .cloned() - .collect() - } -} diff --git a/contracts/ddns/src/lib.rs b/contracts/ddns/src/lib.rs deleted file mode 100644 index 51dbbcd63..000000000 --- a/contracts/ddns/src/lib.rs +++ /dev/null @@ -1,97 +0,0 @@ -#![no_std] - -use ddns_io::*; -use gstd::{async_main, msg, prelude::*, ActorId, Vec}; - -static mut RECORDS: Vec = Vec::new(); - -async unsafe fn add_record(id: ActorId) -> Option { - if RECORDS.iter().any(|r| r.id == id) { - panic!("Program already registered"); - } - - let reply: GetDnsMeta = msg::send_bytes_for_reply_as(id, Vec::from([0]), 0, 0) - .expect("Error in async") - .await - .expect("Unable to get reply"); - - match reply { - GetDnsMeta::DnsMeta(meta) => { - if let Some(dns_meta) = meta { - if RECORDS.iter().any(|r| r.meta.name == dns_meta.name) { - panic!("Domain {} already registered", dns_meta.name); - } - - let record = DnsRecord { - id, - meta: dns_meta, - created_by: msg::source(), - }; - - RECORDS.push(record.clone()); - Some(record) - } else { - None - } - } - } -} - -async unsafe fn update_record(id: ActorId) -> Option { - if let Some(record) = RECORDS.iter_mut().find(|r| r.id == id) { - let reply: GetDnsMeta = msg::send_bytes_for_reply_as(id, Vec::from([0]), 0, 0) - .expect("Error in async") - .await - .expect("Unable to get reply"); - - match reply { - GetDnsMeta::DnsMeta(meta) => { - if let Some(dns_meta) = meta { - record.meta = dns_meta; - - Some(record.clone()) - } else { - None - } - } - } - } else { - None - } -} - -unsafe fn remove_record(id: ActorId) -> Option { - if let Some((index, record)) = RECORDS.iter().enumerate().find(|(_, r)| r.id == id) { - if record.created_by == msg::source() { - Some(RECORDS.swap_remove(index)) - } else { - None - } - } else { - None - } -} - -#[async_main] -async unsafe fn main() { - let action: DnsAction = msg::load().expect("Unable to decode message"); - - unsafe { - let result: DnsReply = match action { - DnsAction::Register(id) => DnsReply::Record(add_record(id).await), - DnsAction::Remove(id) => DnsReply::Record(remove_record(id)), - DnsAction::Update(id) => DnsReply::Record(update_record(id).await), - DnsAction::GetById(id) => DnsReply::Record(RECORDS.get_by_id(id)), - DnsAction::GetByName(name) => DnsReply::Records(RECORDS.get_by_name(name)), - DnsAction::GetByDescription(description) => { - DnsReply::Records(RECORDS.get_by_description(description)) - } - }; - msg::reply_with_gas(result, 0, 0).expect("Error in sending a reply"); - } -} - -#[no_mangle] -unsafe extern fn state() { - msg::reply(RECORDS.clone(), 0).expect("failed to reply"); -} diff --git a/contracts/ddns/state/Cargo.toml b/contracts/ddns/state/Cargo.toml deleted file mode 100644 index 9ea9d9b21..000000000 --- a/contracts/ddns/state/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "ddns-state" -version.workspace = true -edition.workspace = true -publish.workspace = true - -[dependencies] -gstd.workspace = true -gmeta = { workspace = true, features = ["codegen"] } -ddns-io.workspace = true - -[build-dependencies] -gear-wasm-builder = { workspace = true, features = ["metawasm"] } diff --git a/contracts/ddns/state/build.rs b/contracts/ddns/state/build.rs deleted file mode 100644 index b4c4a44e3..000000000 --- a/contracts/ddns/state/build.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - gear_wasm_builder::build_metawasm(); -} diff --git a/contracts/ddns/state/src/lib.rs b/contracts/ddns/state/src/lib.rs deleted file mode 100644 index 98d3e7606..000000000 --- a/contracts/ddns/state/src/lib.rs +++ /dev/null @@ -1,29 +0,0 @@ -#![no_std] - -use ddns_io::*; -use gstd::{prelude::*, ActorId}; - -#[gmeta::metawasm] -pub mod metafns { - pub type State = Vec; - - pub fn get_by_id(state: State, id: ActorId) -> Option { - state.get_by_id(id) - } - - pub fn get_by_name(state: State, name: String) -> Vec { - state.get_by_name(name) - } - - pub fn get_by_creator(state: State, creator: ActorId) -> Vec { - state.get_by_creator(creator) - } - - pub fn get_by_description(state: State, description: String) -> Vec { - state.get_by_description(description) - } - - pub fn get_by_pattern(state: State, pattern: String) -> Vec { - state.get_by_pattern(pattern) - } -} diff --git a/contracts/dex/factory/src/lib.rs b/contracts/dex/factory/src/lib.rs index c91d88626..a68a176c4 100644 --- a/contracts/dex/factory/src/lib.rs +++ b/contracts/dex/factory/src/lib.rs @@ -2,8 +2,8 @@ use dex_factory_io::*; use gstd::{ - collections::HashMap, errors::Result, exec, msg, prelude::*, prog::ProgramGenerator, ActorId, - CodeId, MessageId, + collections::HashMap, errors::CoreError, exec, msg, prelude::*, prog::ProgramGenerator, + ActorId, CodeId, MessageId, }; struct Contract { @@ -72,8 +72,10 @@ impl Contract { }, 0, 0, - )? - .await?; + ) + .unwrap() + .await + .unwrap(); result?; @@ -157,6 +159,6 @@ extern fn state() { .expect("failed to encode or reply from `state()`"); } -fn reply(payload: impl Encode) -> Result { +fn reply(payload: impl Encode) -> Result { msg::reply(payload, 0) } diff --git a/contracts/dex/src/lib.rs b/contracts/dex/src/lib.rs index 87288e9cc..0d2203268 100644 --- a/contracts/dex/src/lib.rs +++ b/contracts/dex/src/lib.rs @@ -207,7 +207,10 @@ impl Contract { async fn calculate_fee(&self) -> Result<(bool, ActorId, U256), Error> { let fee_to_result: Result = - utils::send(self.factory, FactoryAction::GetFeeTo)?.await?; + utils::send(self.factory, FactoryAction::GetFeeTo) + .unwrap() + .await + .unwrap(); let Ok(FactoryEvent::FeeToSet(fee_receiver)) = fee_to_result else { return Err(Error::FeeToGettingFailed); }; diff --git a/contracts/dex/src/utils.rs b/contracts/dex/src/utils.rs index 7be7e6495..476573cc9 100644 --- a/contracts/dex/src/utils.rs +++ b/contracts/dex/src/utils.rs @@ -1,14 +1,17 @@ use dex_io::*; use gear_lib::tx_manager::Stepper; use gstd::{ - errors::Result, + errors::CoreError, msg::{self, CodecMessageFuture}, prelude::*, ActorId, }; use sharded_fungible_token_io::{FTokenAction, FTokenEvent, LogicAction}; -pub fn send(to: ActorId, payload: impl Encode) -> Result> { +pub fn send( + to: ActorId, + payload: impl Encode, +) -> Result, CoreError> { msg::send_for_reply_as(to, payload, 0, 0) } @@ -28,15 +31,19 @@ pub async fn transfer_tokens( }, }; - match send(token, payload)?.await? { + match send(token, payload).unwrap().await.unwrap() { FTokenEvent::Ok => Ok(()), FTokenEvent::Err => Err(Error::TransferFailed), _ => unreachable!("received an unexpected `FTokenEvent` variant"), } } -pub async fn balance_of(token: ActorId, actor: ActorId) -> Result { - if let FTokenEvent::Balance(balance) = send(token, FTokenAction::GetBalance(actor))?.await? { +pub async fn balance_of(token: ActorId, actor: ActorId) -> Result { + if let FTokenEvent::Balance(balance) = send(token, FTokenAction::GetBalance(actor)) + .unwrap() + .await + .unwrap() + { Ok(balance) } else { unreachable!("received an unexpected `FTokenEvent` variant"); diff --git a/contracts/dex/tests/tests.rs b/contracts/dex/tests/tests.rs index f38e700c8..984bf9f93 100644 --- a/contracts/dex/tests/tests.rs +++ b/contracts/dex/tests/tests.rs @@ -21,7 +21,7 @@ fn swaps_and_fee() { let mut factory = Factory::initialize(&system, USERS[2], 0).succeed(); let actor_pair = (fungible_token_a.actor_id(), fungible_token_b.actor_id()); let pair_actor = factory.create_pair(actor_pair).succeed((actor_pair, 1)); - let mut pair = Pair(system.get_program(pair_actor)); + let mut pair = Pair(system.get_program(pair_actor).unwrap()); // Checking the initialization results @@ -227,7 +227,7 @@ fn swap_errors() { let mut factory = Factory::initialize(&system, 0, 0).succeed(); let actor_pair = (fungible_token_a.actor_id(), fungible_token_b.actor_id()); let pair_actor = factory.create_pair(actor_pair).succeed((actor_pair, 1)); - let mut pair = Pair(system.get_program(pair_actor)); + let mut pair = Pair(system.get_program(pair_actor).unwrap()); pair.swap_exact_tokens_for_tokens_with_deadline(USERS[0], (0, 0), USERS[0], SwapKind::AForB, 0) .failed(Error::DeadlineExceeded); @@ -343,7 +343,7 @@ fn add_liquidity() { let mut factory = Factory::initialize(&system, 0, 0).succeed(); let actor_pair = (fungible_token_a.actor_id(), fungible_token_b.actor_id()); let pair_actor = factory.create_pair(actor_pair).succeed((actor_pair, 1)); - let mut pair = Pair(system.get_program(pair_actor)); + let mut pair = Pair(system.get_program(pair_actor).unwrap()); fungible_token_b.mint(pair.actor_id(), u128::MAX); pair.sync().succeed((0, u128::MAX)); @@ -388,7 +388,7 @@ fn add_liquidity_2() { let mut factory = Factory::initialize(&system, 0, 0).succeed(); let actor_pair = (fungible_token_a.actor_id(), fungible_token_b.actor_id()); let pair_actor = factory.create_pair(actor_pair).succeed((actor_pair, 1)); - let mut pair = Pair(system.get_program(pair_actor)); + let mut pair = Pair(system.get_program(pair_actor).unwrap()); // 0 < MINIMUM_LIQUIDITY pair.add_liquidity(USERS[0], (0, 0), (0, 0), USERS[0]) @@ -434,7 +434,7 @@ fn remove_liquidity() { let mut factory = Factory::initialize(&system, 0, 0).succeed(); let actor_pair = (fungible_token_a.actor_id(), fungible_token_b.actor_id()); let pair_actor = factory.create_pair(actor_pair).succeed((actor_pair, 1)); - let mut pair = Pair(system.get_program(pair_actor)); + let mut pair = Pair(system.get_program(pair_actor).unwrap()); pair.remove_liquidity_with_deadline(USERS[0], 0, (0, 0), USERS[0], 0) .failed(Error::DeadlineExceeded); diff --git a/contracts/dutch-auction/tests/dutch_auction_tests.rs b/contracts/dutch-auction/tests/dutch_auction_tests.rs index db42c0b2c..bd174565b 100644 --- a/contracts/dutch-auction/tests/dutch_auction_tests.rs +++ b/contracts/dutch-auction/tests/dutch_auction_tests.rs @@ -12,7 +12,7 @@ fn buy() { let auction = init(&sys); - let nft_program = sys.get_program(2); + let nft_program = sys.get_program(2).unwrap(); let token_id: u64 = 0; let result = auction.send_with_value(USERS[1], Action::Buy, 1_000_000_000_000_000); diff --git a/contracts/dutch-auction/tests/node_tests.rs b/contracts/dutch-auction/tests/node_tests.rs index 6bfa48be9..3ab13e687 100644 --- a/contracts/dutch-auction/tests/node_tests.rs +++ b/contracts/dutch-auction/tests/node_tests.rs @@ -90,12 +90,12 @@ async fn gclient_create_and_stop() -> Result<()> { assert!(listener.message_processed(message_id).await?.succeed()); // Approve NFT to auction - let to = ActorId::from_slice(&auction_program_id.into_bytes()).unwrap(); - println!("INIT DONE. Auction_contract_id: {:?}", to); + + println!("INIT DONE. Auction_contract_id: {:?}", auction_program_id); transaction_id += 1; let approve_action = NFTAction::Approve { transaction_id, - to, + to: auction_program_id, token_id: TokenId::default(), }; let gas_info = api @@ -108,13 +108,10 @@ async fn gclient_create_and_stop() -> Result<()> { // Create Auction let starting_price = 1_000_000_000; let discount_rate = 2_000_000; - let nft_contract_actor_id = ActorId::from_slice(&nft_program_id.into_bytes()).unwrap(); - println!( - "Approve DONE. nft_contract_actor_id: {:?}", - nft_contract_actor_id - ); + // let nft_contract_actor_id = ActorId::from_slice(&nft_program_id.into_bytes()).unwrap(); + println!("Approve DONE. nft_contract_actor_id: {:?}", nft_program_id); let create = Action::Create(CreateConfig { - nft_contract_actor_id, + nft_contract_actor_id: nft_program_id, starting_price, discount_rate, token_id: TokenId::default(), @@ -247,13 +244,13 @@ async fn gclient_create_buy_reward() -> Result<()> { .await?; assert!(listener.message_processed(message_id).await?.succeed()); // Approve NFT to auction - let to = ActorId::from_slice(&auction_program_id.into_bytes()).unwrap(); - println!("INIT DONE. Auction_contract_id: {:?}", to); + // let to = ActorId::from_slice(&auction_program_id.into_bytes()).unwrap(); + println!("INIT DONE. Auction_contract_id: {:?}", auction_program_id); transaction_id += 1; let approve_action = NFTAction::Approve { transaction_id, - to, + to: auction_program_id, token_id: TokenId::default(), }; let gas_info = api @@ -266,13 +263,10 @@ async fn gclient_create_buy_reward() -> Result<()> { // Create Auction let starting_price = 11_000_000_000_000; let discount_rate = 2_000_000; - let nft_contract_actor_id = ActorId::from_slice(&nft_program_id.into_bytes()).unwrap(); - println!( - "Approve DONE. nft_contract_actor_id: {:?}", - nft_contract_actor_id - ); + // let nft_contract_actor_id = ActorId::from_slice(&nft_program_id.into_bytes()).unwrap(); + println!("Approve DONE. nft_contract_actor_id: {:?}", nft_program_id); let create = Action::Create(CreateConfig { - nft_contract_actor_id, + nft_contract_actor_id: nft_program_id, starting_price, discount_rate, token_id: TokenId::default(), diff --git a/contracts/dutch-auction/tests/routines/mod.rs b/contracts/dutch-auction/tests/routines/mod.rs index a7e243244..8de3b7866 100644 --- a/contracts/dutch-auction/tests/routines/mod.rs +++ b/contracts/dutch-auction/tests/routines/mod.rs @@ -8,7 +8,6 @@ use gtest::{Log, Program, RunResult, System}; use non_fungible_token_io::{Config, InitNFT, NFTAction, NFTEvent}; pub const USERS: &[u64] = &[4, 5, 6]; -#[allow(dead_code)] pub const DURATION: u32 = 169 * 60 * 60; pub fn init(sys: &System) -> Program<'_> { @@ -122,7 +121,6 @@ pub fn update_auction( ) } -#[allow(dead_code)] pub fn nft_owner(nft_program: &Program<'_>, from: u64, token_id: TokenId) -> RunResult { nft_program.send(from, NFTAction::Owner { token_id }) } diff --git a/contracts/dynamic-nft/tests/nft_tests.rs b/contracts/dynamic-nft/tests/nft_tests.rs index d8b72e693..0629f9ba5 100644 --- a/contracts/dynamic-nft/tests/nft_tests.rs +++ b/contracts/dynamic-nft/tests/nft_tests.rs @@ -15,7 +15,7 @@ const ZERO_ID: u64 = 0; fn mint_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); let message = NFTEvent::Transfer(NFTTransfer { @@ -51,7 +51,7 @@ fn mint_limit_exceed() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -84,7 +84,7 @@ fn mint_authorized() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -117,7 +117,7 @@ fn mint_not_authorized() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -150,7 +150,7 @@ fn mint_added() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = add_minter(&nft, transaction_id, USERS[1].into(), USERS[0]); assert!(!res.main_failed()); @@ -165,7 +165,7 @@ fn mint_added() { fn burn_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -183,7 +183,7 @@ fn burn_success() { fn burn_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); // must fail since the token doesn't exist @@ -198,7 +198,7 @@ fn burn_failures() { fn transfer_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -216,7 +216,7 @@ fn transfer_success() { fn transfer_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); @@ -235,7 +235,7 @@ fn transfer_failures() { fn owner_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -254,7 +254,7 @@ fn owner_success() { fn is_approved_to_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -285,7 +285,7 @@ fn is_approved_to_success() { fn is_approved_to_failure() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -299,7 +299,7 @@ fn is_approved_to_failure() { fn approve_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -319,7 +319,7 @@ fn approve_success() { fn update_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -339,7 +339,7 @@ fn update_success() { fn approve_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -367,7 +367,7 @@ fn approve_failures() { fn delegated_approve_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let pair = Sr25519Pair::from_seed(&hex!( "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60" )); @@ -402,7 +402,7 @@ fn delegated_approve_success() { fn delegated_approve_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let pair = Sr25519Pair::from_seed(&hex!( "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60" )); @@ -441,7 +441,7 @@ fn delegated_approve_failures() { assert!(delegated_approve(&nft, transaction_id, USERS[0], message, signature.0).main_failed()); // Must fail if user tries to approve token in wrong contract init_nft(&sys); - let second_nft = sys.get_program(2); + let second_nft = sys.get_program(2).unwrap(); transaction_id += 1; assert!(!add_minter(&second_nft, transaction_id, owner_id.into(), USERS[0]).main_failed()); transaction_id += 1; diff --git a/contracts/dynamic-nft/tests/node_tests.rs b/contracts/dynamic-nft/tests/node_tests.rs index 990bee790..9128ec111 100644 --- a/contracts/dynamic-nft/tests/node_tests.rs +++ b/contracts/dynamic-nft/tests/node_tests.rs @@ -16,7 +16,12 @@ async fn gclient_mint_test() -> Result<()> { name: String::from("MyToken"), description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -84,7 +89,12 @@ async fn gclient_burn_test() -> Result<()> { description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -190,7 +200,12 @@ async fn gclient_transfer_test() -> Result<()> { description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -279,7 +294,12 @@ async fn gclient_owner_test() -> Result<()> { description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -362,7 +382,12 @@ async fn gclient_approved() -> Result<()> { description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, diff --git a/contracts/escrow/tests/utils/token.rs b/contracts/escrow/tests/utils/token.rs index 69835b33b..e75b9afe6 100644 --- a/contracts/escrow/tests/utils/token.rs +++ b/contracts/escrow/tests/utils/token.rs @@ -29,7 +29,7 @@ pub trait FToken { impl FToken for Program<'_> { fn ftoken(owner: u64, id: u64, system: &System) -> Program<'_> { - let ftoken = Program::from_file_with_id( + let ftoken = Program::from_binary_with_id( system, id, "../target/wasm32-unknown-unknown/debug/sharded_fungible_token.opt.wasm", diff --git a/contracts/fungible-token/src/lib.rs b/contracts/fungible-token/src/lib.rs index 1abaafb17..3bd845025 100644 --- a/contracts/fungible-token/src/lib.rs +++ b/contracts/fungible-token/src/lib.rs @@ -1,9 +1,7 @@ #![no_std] use fungible_token_io::*; -use gstd::{ - collections::HashMap, errors::Result as GstdResult, msg, prelude::*, ActorId, MessageId, -}; +use gstd::{collections::HashMap, msg, prelude::*, ActorId}; #[cfg(test)] mod tests; @@ -168,14 +166,10 @@ fn static_mut_state() -> &'static mut FungibleToken { #[no_mangle] extern fn state() { - reply(common_state()) + msg::reply(common_state(), 0) .expect("Failed to encode or reply with `::State` from `state()`"); } -fn reply(payload: impl Encode) -> GstdResult { - msg::reply(payload, 0) -} - #[no_mangle] extern fn handle() { let action: FTAction = msg::load().expect("Could not load Action"); diff --git a/contracts/fungible-token/src/tests.rs b/contracts/fungible-token/src/tests.rs index dff61b06b..325ce16a1 100644 --- a/contracts/fungible-token/src/tests.rs +++ b/contracts/fungible-token/src/tests.rs @@ -35,7 +35,7 @@ fn init_with_mint(sys: &System) { fn mint() { let sys = System::new(); init_with_mint(&sys); - let ft = sys.get_program(1); + let ft = sys.get_program(1).unwrap(); let res = ft.send(USERS[0], FTAction::BalanceOf(USERS[0].into())); assert!(res.contains(&(USERS[0], FTEvent::Balance(1000000).encode()))); } @@ -44,7 +44,7 @@ fn mint() { fn burn() { let sys = System::new(); init_with_mint(&sys); - let ft = sys.get_program(1); + let ft = sys.get_program(1).unwrap(); let res = ft.send(USERS[0], FTAction::Burn(1000)); assert!(res.contains(&( USERS[0], @@ -64,7 +64,7 @@ fn burn_failures() { let sys = System::new(); sys.init_logger(); init_with_mint(&sys); - let ft = sys.get_program(1); + let ft = sys.get_program(1).unwrap(); // must fail since the amount > the user balance let res = ft.send(USERS[0], FTAction::Burn(1000001)); assert!(res.main_failed()); @@ -74,7 +74,7 @@ fn burn_failures() { fn transfer() { let sys = System::new(); init_with_mint(&sys); - let ft = sys.get_program(1); + let ft = sys.get_program(1).unwrap(); let res = ft.send( USERS[0], FTAction::Transfer { @@ -105,7 +105,7 @@ fn transfer() { fn transfer_failures() { let sys = System::new(); init_with_mint(&sys); - let ft = sys.get_program(1); + let ft = sys.get_program(1).unwrap(); //must fail since the amount > balance let res = ft.send( USERS[0], @@ -133,7 +133,7 @@ fn transfer_failures() { fn approve_and_transfer() { let sys = System::new(); init_with_mint(&sys); - let ft = sys.get_program(1); + let ft = sys.get_program(1).unwrap(); let res = ft.send( USERS[0], diff --git a/contracts/galactic-express/.binpath b/contracts/galactic-express/.binpath index b4c198035..27edebedf 100644 --- a/contracts/galactic-express/.binpath +++ b/contracts/galactic-express/.binpath @@ -1 +1 @@ -../target/wasm32-unknown-unknown/release/galactic_express \ No newline at end of file +../target/wasm32-unknown-unknown/debug/galactic_express \ No newline at end of file diff --git a/contracts/game-of-chance/src/lib.rs b/contracts/game-of-chance/src/lib.rs index a2ef95def..3b50b4100 100644 --- a/contracts/game-of-chance/src/lib.rs +++ b/contracts/game-of-chance/src/lib.rs @@ -3,10 +3,9 @@ use game_of_chance_io::*; use gstd::{ collections::{BTreeMap, HashMap}, - errors::Result as GstdResult, exec, msg, prelude::*, - ActorId, MessageId, + ActorId, }; use rand::{RngCore, SeedableRng}; use rand_xoshiro::Xoshiro128PlusPlus; @@ -123,7 +122,7 @@ impl Contract { ) .await?; } else { - send_value(winner, self.prize_fund)?; + msg::send_bytes(winner, [], self.prize_fund).expect("Error send value"); } self.is_active = false; @@ -182,8 +181,10 @@ impl Contract { }, 0, 0, - )? - .await? + ) + .unwrap() + .await + .unwrap() { FTokenEvent::Ok => Ok(()), FTokenEvent::Err => Err(Error::TokenTransferFailed), @@ -224,7 +225,7 @@ impl Contract { let msg_value = msg::value(); if msg_value != self.participation_cost { - send_value(msg_source, msg_value)?; + msg::send_bytes(msg_source, [], msg_value).expect("Error send value"); return Err(Error::InvalidParticipationCost); } @@ -237,20 +238,12 @@ impl Contract { } } -fn reply(payload: impl Encode) -> GstdResult { - msg::reply(payload, 0) -} - -fn send_value(program: ActorId, value: u128) -> GstdResult { - msg::send_bytes(program, [], value) -} - #[no_mangle] extern fn init() { let result = process_init(); let is_err = result.is_err(); - - reply(result).expect("Failed to encode or reply with `Result<(), Error>` from `init()`"); + msg::reply(result, 0) + .expect("Failed to encode or reply with `Result<(), Error>` from `init()`"); if is_err { exec::exit(ActorId::zero()); @@ -276,7 +269,7 @@ fn process_init() -> Result<(), Error> { #[gstd::async_main] async fn main() { - reply(process_handle().await).expect("failed to encode or reply from `handle()`"); + msg::reply(process_handle().await, 0).expect("failed to encode or reply from `handle()`"); } async fn process_handle() -> Result { diff --git a/contracts/horse-races/tests/utils.rs b/contracts/horse-races/tests/utils.rs index acf68b510..f9393a916 100644 --- a/contracts/horse-races/tests/utils.rs +++ b/contracts/horse-races/tests/utils.rs @@ -20,12 +20,12 @@ pub fn get_programs(sys: &System) -> (Program<'_>, Program<'_>, Program<'_>) { sys.init_logger(); let current_program = Program::current_with_id(sys, HORSE_RACES_ID); - let oracle_program = Program::from_file_with_id( + let oracle_program = Program::from_binary_with_id( sys, ORACLE_ID, "../target/wasm32-unknown-unknown/debug/oracle_randomness.opt.wasm", ); - let token_program = Program::from_file_with_id( + let token_program = Program::from_binary_with_id( sys, TOKEN_ID, "../target/wasm32-unknown-unknown/debug/fungible_token.opt.wasm", diff --git a/contracts/multi-token/tests/mtk_tests.rs b/contracts/multi-token/tests/mtk_tests.rs index 42ef0d9dc..becec9eef 100644 --- a/contracts/multi-token/tests/mtk_tests.rs +++ b/contracts/multi-token/tests/mtk_tests.rs @@ -16,7 +16,7 @@ const NFT_2_ID: u128 = 100002; fn mint_success() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); // USERS[0] should have no token_ids before check_token_ids_for_owner(&mtk, USERS[0], vec![]); mint_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT, None, None); @@ -41,7 +41,7 @@ fn mint_success() { fn mint_failures() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); // MUST fail since we are minting to ZERO_ID mint_internal( &mtk, @@ -111,7 +111,7 @@ fn mint_failures() { fn burn() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); mint_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT, None, None); check_balance(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT); burn_internal(&mtk, USERS[0], TOKEN_ID, TOKENS_TO_BURN, None); @@ -142,7 +142,7 @@ fn burn() { fn burn_failures() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); mint_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT, None, None); // MUST fail since we do not have enough tokens burn_internal( @@ -188,7 +188,7 @@ fn burn_failures() { fn balance() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); mint_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT, None, None); check_balance(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT); balance_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT); @@ -198,7 +198,7 @@ fn balance() { fn balance_of_batch() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); mint_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT, None, None); check_balance(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT); mint_internal(&mtk, USERS[1], TOKEN_ID + 1, TOKEN_AMOUNT, None, None); @@ -216,7 +216,7 @@ fn balance_of_batch() { fn transfer_from() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); mint_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT, None, None); check_balance(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT); // USERS[1] should have no token_ids before @@ -233,7 +233,7 @@ fn transfer_from() { fn transfer_from_failures() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); mint_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT, None, None); check_balance(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT); // MUST fail since we are sending to a ZERO account @@ -293,7 +293,7 @@ fn transfer_from_failures() { fn transfer_from_batch() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); mint_batch_internal( &mtk, USERS[0], @@ -325,7 +325,7 @@ fn transfer_from_batch() { fn test_approve_and_revoke() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); approve(&mtk, USERS[0], USERS[1], None); mint_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT, None, None); check_balance(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT); @@ -366,7 +366,7 @@ fn test_approve_and_revoke() { fn transform() { let sys = System::new(); init_mtk(&sys, USERS[0]); - let mtk = sys.get_program(1); + let mtk = sys.get_program(1).unwrap(); mint_internal(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT, None, None); check_balance(&mtk, USERS[0], TOKEN_ID, TOKEN_AMOUNT); let nfts = vec![BurnToNFT { diff --git a/contracts/nft-marketplace/tests/utils_gclient/common.rs b/contracts/nft-marketplace/tests/utils_gclient/common.rs index 8347013fc..3e3348e1d 100644 --- a/contracts/nft-marketplace/tests/utils_gclient/common.rs +++ b/contracts/nft-marketplace/tests/utils_gclient/common.rs @@ -1,6 +1,6 @@ use blake2_rfc::blake2b; use gclient::GearApi; -use gstd::ActorId; +use gstd::{ActorId, Encode}; pub const HASH_LENGTH: usize = 32; pub type Hash = [u8; HASH_LENGTH]; @@ -43,8 +43,15 @@ pub async fn get_user_to_actor_id(user: impl AsRef) -> gclient::Result gclient::Result<(ActorId, ActorId, ActorId)> { for user in &USERS[..4] { let user_id = get_user_to_actor_id(user).await?; - api.transfer_keep_alive(user_id.as_ref().into(), USERS_FUND) - .await?; + api.transfer_keep_alive( + user_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + USERS_FUND, + ) + .await?; } let seller_id = get_user_to_actor_id(SELLER).await?; @@ -52,17 +59,32 @@ pub async fn init(api: &GearApi) -> gclient::Result<(ActorId, ActorId, ActorId)> let treasury_id = get_user_to_actor_id(TREASURY).await?; api.transfer_keep_alive( - seller_id.as_ref().into(), + seller_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), api.total_balance(api.account_id()).await? / 2, ) .await?; api.transfer_keep_alive( - buyer_id.as_ref().into(), + buyer_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), api.total_balance(api.account_id()).await? / 2, ) .await?; - api.transfer_keep_alive(treasury_id.as_ref().into(), USERS_FUND) - .await?; + api.transfer_keep_alive( + treasury_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + USERS_FUND, + ) + .await?; let ft_contract = super::ft::init(api).await?; let nft_contract = super::nft::init(api).await?; diff --git a/contracts/nft-marketplace/tests/utils_gclient/marketplace.rs b/contracts/nft-marketplace/tests/utils_gclient/marketplace.rs index 18ade29d6..f172d2919 100644 --- a/contracts/nft-marketplace/tests/utils_gclient/marketplace.rs +++ b/contracts/nft-marketplace/tests/utils_gclient/marketplace.rs @@ -479,9 +479,15 @@ pub async fn accept_offer( } pub async fn state(api: &GearApi, program_id: &ActorId) -> gclient::Result { - let program_id_ref = program_id.as_ref(); - - api.read_state(program_id_ref.into(), vec![]).await + api.read_state( + program_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + vec![], + ) + .await } async fn send_message( diff --git a/contracts/nft-master/tests/utils_gclient/common.rs b/contracts/nft-master/tests/utils_gclient/common.rs index 74be109b9..dfb3140d5 100644 --- a/contracts/nft-master/tests/utils_gclient/common.rs +++ b/contracts/nft-master/tests/utils_gclient/common.rs @@ -15,7 +15,11 @@ pub async fn fund_users(api: &GearApi) -> gclient::Result<()> { for user in USERS { let user_id = get_user_to_actor_id(user).await?; - let user_program_id = user_id.encode().as_slice().into(); + let user_program_id = user_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."); api.transfer_keep_alive(user_program_id, amount).await?; } diff --git a/contracts/nft-master/tests/utils_gclient/nft_master.rs b/contracts/nft-master/tests/utils_gclient/nft_master.rs index f06e96d0e..21c656bd9 100644 --- a/contracts/nft-master/tests/utils_gclient/nft_master.rs +++ b/contracts/nft-master/tests/utils_gclient/nft_master.rs @@ -123,7 +123,11 @@ pub async fn remove_operator( } pub async fn get_state(api: &GearApi, program_id: &ActorId) -> gclient::Result { - let program_id = program_id.encode().as_slice().into(); + let program_id = program_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."); api.read_state(program_id, vec![]).await } diff --git a/contracts/nft-pixelboard/src/lib.rs b/contracts/nft-pixelboard/src/lib.rs index 22d0bcd03..428abf568 100644 --- a/contracts/nft-pixelboard/src/lib.rs +++ b/contracts/nft-pixelboard/src/lib.rs @@ -1,10 +1,7 @@ #![no_std] use gear_lib_old::non_fungible_token::token::{TokenId, TokenMetadata}; -use gstd::{ - async_main, collections::BTreeMap, errors::Result as GstdResult, exec, msg, prelude::*, - ActorId, MessageId, -}; +use gstd::{async_main, collections::BTreeMap, exec, msg, prelude::*, ActorId}; use nft_pixelboard_io::*; pub const MIN_STEP_FOR_TX: u64 = 3; @@ -339,7 +336,8 @@ extern fn init() { let result = process_init(); let is_err = result.is_err(); - reply(result).expect("Failed to encode or reply with `Result<(), Error>` from `init()`"); + msg::reply(result, 0) + .expect("Failed to encode or reply with `Result<(), Error>` from `init()`"); if is_err { exec::exit(ActorId::zero()); @@ -420,7 +418,7 @@ async fn main() { Err(NFTPixelboardError::PreviousTxMustBeCompleted); let tx_id = if let Some((tx_id, pend_action)) = program.txs.get(&msg_source) { if action != *pend_action { - reply(_reply).expect( + msg::reply(_reply, 0).expect( "Failed to encode or reply with `Result`", ); return; @@ -462,14 +460,10 @@ async fn main() { } NFTPixelboardAction::Paint { token_id, painting } => program.paint(token_id, painting), }; - reply(result) + msg::reply(result, 0) .expect("Failed to encode or reply with `Result`"); } -fn reply(payload: impl Encode) -> GstdResult { - msg::reply(payload, 0) -} - #[no_mangle] extern fn state() { let nft_pixelboard = unsafe { PROGRAM.take().expect("Program is not initialized") }; diff --git a/contracts/nft/tests/tests.rs b/contracts/nft/tests/tests.rs index 13d69fce1..cca0ee273 100644 --- a/contracts/nft/tests/tests.rs +++ b/contracts/nft/tests/tests.rs @@ -11,7 +11,7 @@ const ZERO_ID: u64 = 0; fn mint_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let res = mint(&nft, USERS[0], USERS[1].into()); let token_metadata = TokenMetadata { @@ -58,7 +58,7 @@ fn mint_failures() { assert!(res.main_failed()); // limit_exceed - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let res = mint(&nft, USERS[0], USERS[1].into()); assert!(!res.main_failed()); let res = mint(&nft, USERS[0], USERS[1].into()); @@ -69,7 +69,7 @@ fn mint_failures() { fn burn_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let res = mint(&nft, USERS[0], USERS[1].into()); assert!(!res.main_failed()); let res = burn(&nft, USERS[1], 0); @@ -85,7 +85,7 @@ fn burn_success() { fn burn_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); mint(&nft, USERS[0], USERS[1].into()); // must fail since the token doesn't exist assert!(burn(&nft, USERS[1], 1).main_failed()); @@ -97,7 +97,7 @@ fn burn_failures() { fn transfer_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!mint(&nft, USERS[0], USERS[1].into()).main_failed()); let res = transfer(&nft, USERS[1], USERS[2], 0); @@ -118,7 +118,7 @@ fn transfer_success() { fn transfer_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!mint(&nft, USERS[0], USERS[1].into()).main_failed()); // must fail since the token doesn't exist @@ -133,7 +133,7 @@ fn transfer_failures() { fn approve_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!mint(&nft, USERS[0], USERS[1].into()).main_failed()); let res = approve(&nft, USERS[1], USERS[2], 0); let message = NftEvent::Approved { @@ -156,7 +156,7 @@ fn approve_success() { fn approve_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!mint(&nft, USERS[0], USERS[1].into()).main_failed()); // must fail since the token doesn't exist assert!(approve(&nft, USERS[1], USERS[2], 1).main_failed()); @@ -177,7 +177,7 @@ fn approve_failures() { fn owner_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!mint(&nft, USERS[0], USERS[1].into()).main_failed()); let res = owner_of(&nft, USERS[1], 0); @@ -193,7 +193,7 @@ fn owner_success() { fn owner_failure() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!mint(&nft, USERS[0], USERS[1].into()).main_failed()); let res = owner_of(&nft, USERS[1], 1); assert!(res.main_failed()); @@ -203,7 +203,7 @@ fn owner_failure() { fn is_approved_to_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!mint(&nft, USERS[0], USERS[1].into()).main_failed()); assert!(!approve(&nft, USERS[1], USERS[2], 0).main_failed()); @@ -221,7 +221,7 @@ fn is_approved_to_success() { fn is_approved_to_failure() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!mint(&nft, USERS[0], USERS[1].into()).main_failed()); assert!(!approve(&nft, USERS[1], USERS[2], 0).main_failed()); let res = is_approved_to(&nft, USERS[1], 1, USERS[2]); diff --git a/contracts/non-fungible-token/tests/nft_tests.rs b/contracts/non-fungible-token/tests/nft_tests.rs index cd51fba85..016cd7bb2 100644 --- a/contracts/non-fungible-token/tests/nft_tests.rs +++ b/contracts/non-fungible-token/tests/nft_tests.rs @@ -15,7 +15,7 @@ const ZERO_ID: u64 = 0; fn mint_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); let message = NFTEvent::Transfer(NFTTransfer { @@ -51,7 +51,7 @@ fn mint_limit_exceed() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -84,7 +84,7 @@ fn mint_authorized() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -117,7 +117,7 @@ fn mint_not_authorized() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -150,7 +150,7 @@ fn mint_added() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = add_minter(&nft, transaction_id, USERS[1].into(), USERS[0]); assert!(!res.main_failed()); @@ -165,7 +165,7 @@ fn mint_added() { fn burn_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -183,7 +183,7 @@ fn burn_success() { fn burn_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); // must fail since the token doesn't exist @@ -198,7 +198,7 @@ fn burn_failures() { fn transfer_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -216,7 +216,7 @@ fn transfer_success() { fn transfer_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); @@ -235,7 +235,7 @@ fn transfer_failures() { fn owner_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -254,7 +254,7 @@ fn owner_success() { fn is_approved_to_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -285,7 +285,7 @@ fn is_approved_to_success() { fn is_approved_to_failure() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -299,7 +299,7 @@ fn is_approved_to_failure() { fn approve_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -319,7 +319,7 @@ fn approve_success() { fn approve_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -347,7 +347,7 @@ fn approve_failures() { fn delegated_approve_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let pair = Sr25519Pair::from_seed(&hex!( "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60" )); @@ -382,7 +382,7 @@ fn delegated_approve_success() { fn delegated_approve_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let pair = Sr25519Pair::from_seed(&hex!( "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60" )); @@ -421,7 +421,7 @@ fn delegated_approve_failures() { assert!(delegated_approve(&nft, transaction_id, USERS[0], message, signature.0).main_failed()); // Must fail if user tries to approve token in wrong contract init_nft(&sys); - let second_nft = sys.get_program(2); + let second_nft = sys.get_program(2).unwrap(); transaction_id += 1; assert!(!add_minter(&second_nft, transaction_id, owner_id.into(), USERS[0]).main_failed()); transaction_id += 1; diff --git a/contracts/non-fungible-token/tests/node_tests.rs b/contracts/non-fungible-token/tests/node_tests.rs index 28f741810..36b8a2a74 100644 --- a/contracts/non-fungible-token/tests/node_tests.rs +++ b/contracts/non-fungible-token/tests/node_tests.rs @@ -16,7 +16,12 @@ async fn gclient_mint_test() -> Result<()> { name: String::from("MyToken"), description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -83,8 +88,12 @@ async fn gclient_burn_test() -> Result<()> { name: String::from("MyToken"), description: String::from("My token"), }; - - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -190,7 +199,12 @@ async fn gclient_transfer_test() -> Result<()> { description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -279,7 +293,12 @@ async fn gclient_owner_test() -> Result<()> { description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -362,7 +381,12 @@ async fn gclient_approved() -> Result<()> { description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, diff --git a/contracts/on-chain-nft/tests/on_chain_tests.rs b/contracts/on-chain-nft/tests/on_chain_tests.rs index 20ff2fbe9..8eab4c8ef 100644 --- a/contracts/on-chain-nft/tests/on_chain_tests.rs +++ b/contracts/on-chain-nft/tests/on_chain_tests.rs @@ -13,7 +13,7 @@ const ZERO_ID: u64 = 0; fn mint_success() { let sys = System::new(); utils::init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let res = utils::mint(&nft, USERS[0], vec![0, 1]); let message = OnChainNFTEvent::Transfer(NFTTransfer { from: ZERO_ID.into(), @@ -30,7 +30,7 @@ fn mint_success() { fn mint_failures() { let sys = System::new(); utils::init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(utils::mint(&nft, USERS[0], vec![3, 3]).main_failed()); // mint token @@ -43,7 +43,7 @@ fn mint_failures() { fn burn_success() { let sys = System::new(); utils::init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!utils::mint(&nft, USERS[0], vec![0, 1]).main_failed()); // Check that we minted a token properly utils::check_token_from_state(&nft, USERS[0], 0); @@ -64,7 +64,7 @@ fn burn_success() { fn burn_failures() { let sys = System::new(); utils::init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!utils::mint(&nft, USERS[0], vec![0, 1]).main_failed()); // must fail since the token doesn't exist assert!(utils::burn(&nft, USERS[0], 1).main_failed()); @@ -76,7 +76,7 @@ fn burn_failures() { fn transfer_success() { let sys = System::new(); utils::init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!utils::mint(&nft, USERS[0], vec![0, 1]).main_failed()); // Check that we minted a token properly utils::check_token_from_state(&nft, USERS[0], 0); @@ -98,7 +98,7 @@ fn transfer_success() { fn transfer_failures() { let sys = System::new(); utils::init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!utils::mint(&nft, USERS[0], vec![0, 1]).main_failed()); // must fail since the token doesn't exist @@ -113,7 +113,7 @@ fn transfer_failures() { fn approve_success() { let sys = System::new(); utils::init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!utils::mint(&nft, USERS[0], vec![0, 1]).main_failed()); // Check that we minted a token properly utils::check_token_from_state(&nft, USERS[0], 0); @@ -133,7 +133,7 @@ fn approve_success() { fn approve_failures() { let sys = System::new(); utils::init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); assert!(!utils::mint(&nft, USERS[0], vec![0, 1]).main_failed()); // must fail since the token doesn't exist assert!(utils::approve(&nft, USERS[0], USERS[1], 1).main_failed()); @@ -154,7 +154,7 @@ fn approve_failures() { fn test_token_uri_state() { let sys = System::new(); utils::init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let res = utils::mint(&nft, USERS[0], vec![0, 1]); let message = OnChainNFTEvent::Transfer(NFTTransfer { from: ZERO_ID.into(), diff --git a/contracts/oracle/tests/node_tests.rs b/contracts/oracle/tests/node_tests.rs index acab3850e..34fb0d305 100644 --- a/contracts/oracle/tests/node_tests.rs +++ b/contracts/oracle/tests/node_tests.rs @@ -137,7 +137,11 @@ pub async fn gclient_success_request_value() -> gclient::Result<()> { let api = api.with(MANAGER_GCLIENT)?; let manager_account_id = api.account_id().clone(); - let manager_program_id = manager_account_id.encode().as_slice().into(); + let manager_program_id = manager_account_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."); let manager_id = ActorId::new((*api.account_id()).clone().into()); let api = api.with(OWNER_GCLIENT)?; diff --git a/contracts/rentable-nft/tests/nft_tests.rs b/contracts/rentable-nft/tests/nft_tests.rs index ace3f1925..5b65d3223 100644 --- a/contracts/rentable-nft/tests/nft_tests.rs +++ b/contracts/rentable-nft/tests/nft_tests.rs @@ -16,7 +16,7 @@ const ZERO_ID: u64 = 0; fn mint_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); let message = NFTEvent::Transfer(NFTTransfer { @@ -52,7 +52,7 @@ fn mint_limit_exceed() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -85,7 +85,7 @@ fn mint_authorized() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -118,7 +118,7 @@ fn mint_not_authorized() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = mint(&nft, transaction_id, USERS[0]); assert!(!res.main_failed()); @@ -151,7 +151,7 @@ fn mint_added() { assert!(!res.main_failed()); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let transaction_id: u64 = 0; let res = add_minter(&nft, transaction_id, USERS[1].into(), USERS[0]); assert!(!res.main_failed()); @@ -166,7 +166,7 @@ fn mint_added() { fn burn_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -184,7 +184,7 @@ fn burn_success() { fn burn_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); // must fail since the token doesn't exist @@ -199,7 +199,7 @@ fn burn_failures() { fn transfer_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -217,7 +217,7 @@ fn transfer_success() { fn transfer_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); @@ -236,7 +236,7 @@ fn transfer_failures() { fn owner_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -255,7 +255,7 @@ fn owner_success() { fn set_user() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id = 0u64; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -294,7 +294,7 @@ fn set_user() { fn is_approved_to_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -325,7 +325,7 @@ fn is_approved_to_success() { fn is_approved_to_failure() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -339,7 +339,7 @@ fn is_approved_to_failure() { fn approve_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -359,7 +359,7 @@ fn approve_success() { fn approve_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id: u64 = 0; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -387,7 +387,7 @@ fn approve_failures() { fn user_of() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id = 0u64; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -430,7 +430,7 @@ fn user_of() { fn user_expires() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let mut transaction_id = 0u64; assert!(!mint(&nft, transaction_id, USERS[0]).main_failed()); transaction_id += 1; @@ -472,7 +472,7 @@ fn user_expires() { fn delegated_approve_success() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let pair = Sr25519Pair::from_seed(&hex!( "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60" )); @@ -507,7 +507,7 @@ fn delegated_approve_success() { fn delegated_approve_failures() { let sys = System::new(); init_nft(&sys); - let nft = sys.get_program(1); + let nft = sys.get_program(1).unwrap(); let pair = Sr25519Pair::from_seed(&hex!( "9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60" )); @@ -546,7 +546,7 @@ fn delegated_approve_failures() { assert!(delegated_approve(&nft, transaction_id, USERS[0], message, signature.0).main_failed()); // Must fail if user tries to approve token in wrong contract init_nft(&sys); - let second_nft = sys.get_program(2); + let second_nft = sys.get_program(2).unwrap(); transaction_id += 1; assert!(!add_minter(&second_nft, transaction_id, owner_id.into(), USERS[0]).main_failed()); transaction_id += 1; diff --git a/contracts/rentable-nft/tests/node_tests.rs b/contracts/rentable-nft/tests/node_tests.rs index 7789cc511..9ce56dae1 100644 --- a/contracts/rentable-nft/tests/node_tests.rs +++ b/contracts/rentable-nft/tests/node_tests.rs @@ -16,7 +16,12 @@ async fn gclient_mint_test() -> Result<()> { name: String::from("MyToken"), description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -84,7 +89,12 @@ async fn gclient_burn_test() -> Result<()> { name: String::from("MyToken"), description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -189,7 +199,12 @@ async fn gclient_transfer_test() -> Result<()> { name: String::from("MyToken"), description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -274,7 +289,12 @@ async fn gclient_owner_test() -> Result<()> { name: String::from("MyToken"), description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, @@ -347,7 +367,12 @@ async fn gclient_approved() -> Result<()> { name: String::from("MyToken"), description: String::from("My token"), }; - let actor_id = ActorId::from_slice(&api.account_id().encode()).unwrap(); + let actor_id = ActorId::new( + api.account_id() + .encode() + .try_into() + .expect("Unexpected invalid account id length."), + ); let init_nft = InitNFT { collection, royalties: None, diff --git a/contracts/rmrk/tests/catalog.rs b/contracts/rmrk/tests/catalog.rs index d0a7f6a3a..1cabadb99 100644 --- a/contracts/rmrk/tests/catalog.rs +++ b/contracts/rmrk/tests/catalog.rs @@ -23,7 +23,7 @@ pub fn init_catalog(sys: &System, admin: u64) { fn add_parts() { let system = System::new(); init_catalog(&system, ADMIN); - let catalog = system.get_program(1); + let catalog = system.get_program(1).unwrap(); // Add fixed part let fixed_part_data = Part::Fixed(FixedPart { @@ -157,7 +157,7 @@ fn add_parts() { fn add_parts_error_cases() { let system = System::new(); init_catalog(&system, ADMIN); - let catalog = system.get_program(1); + let catalog = system.get_program(1).unwrap(); let fixed_part_data = Part::Fixed(FixedPart { z: Some(0), @@ -202,7 +202,7 @@ fn add_parts_error_cases() { fn equippable() { let system = System::new(); init_catalog(&system, ADMIN); - let catalog = system.get_program(1); + let catalog = system.get_program(1).unwrap(); // Add fixed part let fixed_part_id = 1; diff --git a/contracts/rmrk/tests/equippable/utils.rs b/contracts/rmrk/tests/equippable/utils.rs index 370efb4a7..fa3432e59 100644 --- a/contracts/rmrk/tests/equippable/utils.rs +++ b/contracts/rmrk/tests/equippable/utils.rs @@ -13,8 +13,7 @@ const GEM_ID: u64 = 11; pub fn setup_catalog(system: &System) { let mut parts = BTreeMap::new(); - - let catalog = Program::from_file_with_id(system, CATALOG_ID, PATH_TO_CATALOG); + let catalog = Program::from_binary_with_id(system, CATALOG_ID, PATH_TO_CATALOG); let res = catalog.send( ADMIN, InitCatalog { @@ -180,7 +179,7 @@ pub fn mint_tokens(system: &System) { } pub fn add_kanaria_assets(system: &System) { - let kanaria = system.get_program(KANARIA_ID); + let kanaria = system.get_program(KANARIA_ID).unwrap(); let default_asset_id = 1; let composed_asset_id = 2; @@ -212,7 +211,7 @@ pub fn add_kanaria_assets(system: &System) { } pub fn add_gem_assets(system: &System) { - let gem = system.get_program(GEM_ID); + let gem = system.get_program(GEM_ID).unwrap(); // These refIds are used from the child's perspective, to group assets that can be equipped into a parent // With it, we avoid the need to do set it asset by asset @@ -334,7 +333,7 @@ pub fn add_gem_assets(system: &System) { } pub fn equip_gems(system: &System) { - let kanaria = system.get_program(KANARIA_ID); + let kanaria = system.get_program(KANARIA_ID).unwrap(); let result = kanaria.send( ADMIN, @@ -380,7 +379,7 @@ pub fn equip_gems(system: &System) { } pub fn compose(system: &System, token_id: TokenId, asset_id: u64) { - let kanaria = system.get_program(KANARIA_ID); + let kanaria = system.get_program(KANARIA_ID).unwrap(); let (metadata, equippable_group_id, catalog_address, part_ids): ( String, u64, @@ -399,7 +398,7 @@ pub fn compose(system: &System, token_id: TokenId, asset_id: u64) { println!("equippable_group_id {:?}", equippable_group_id); println!("catalog_address {:?}", catalog_address); - let catalog = system.get_program(CATALOG_ID); + let catalog = system.get_program(CATALOG_ID).unwrap(); let catalog_state: CatalogState = catalog .read_state(0) .expect("Failed to decode CatalogState"); diff --git a/contracts/roll-the-dice/tests/roll_dice.rs b/contracts/roll-the-dice/tests/roll_dice.rs index 8387503f8..6e7177eba 100644 --- a/contracts/roll-the-dice/tests/roll_dice.rs +++ b/contracts/roll-the-dice/tests/roll_dice.rs @@ -13,7 +13,7 @@ fn success_roll() { let sys = System::new(); sys.init_logger(); - let oracle_program = Program::from_file_with_id( + let oracle_program = Program::from_binary_with_id( &sys, ORACLE_ID, "../target/wasm32-unknown-unknown/debug/oracle.opt.wasm", @@ -52,7 +52,7 @@ fn success_roll_finished() { let state_wasm = get_state(); - let oracle_program = Program::from_file_with_id( + let oracle_program = Program::from_binary_with_id( &sys, ORACLE_ID, "../target/wasm32-unknown-unknown/debug/oracle.opt.wasm", diff --git a/contracts/sharded-multi-token/tests/gclient_ft.rs b/contracts/sharded-multi-token/tests/gclient_ft.rs index f1a26c380..3e9e81df5 100644 --- a/contracts/sharded-multi-token/tests/gclient_ft.rs +++ b/contracts/sharded-multi-token/tests/gclient_ft.rs @@ -87,8 +87,15 @@ async fn gclient_success_mint_batch_ft() -> gclient::Result<()> { let (api, user_account_0) = gclient_with_account(api, USER_ACCOUNTS[0])?; let mut listener = api.subscribe().await?; - api.transfer_keep_alive(user_account_1.encode().as_slice().into(), 10000) - .await?; + api.transfer_keep_alive( + user_account_1 + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + 10000, + ) + .await?; mtoken_create( &api, @@ -167,8 +174,15 @@ async fn gclient_success_burn_batch_ft() -> gclient::Result<()> { let (api, user_account_0) = gclient_with_account(api, USER_ACCOUNTS[0])?; let mut listener = api.subscribe().await?; - api.transfer_keep_alive(user_account_1.encode().as_slice().into(), 10000) - .await?; + api.transfer_keep_alive( + user_account_1 + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + 10000, + ) + .await?; mtoken_create( &api, @@ -392,8 +406,15 @@ async fn gclient_success_transfer_ft() -> gclient::Result<()> { let (api, user_account_0) = gclient_with_account(api, USER_ACCOUNTS[0])?; let mut listener = api.subscribe().await?; - api.transfer_keep_alive(user_account_1.encode().as_slice().into(), 10000) - .await?; + api.transfer_keep_alive( + user_account_1 + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + 10000, + ) + .await?; mtoken_create( &api, diff --git a/contracts/sharded-multi-token/tests/utils_gclient/mod.rs b/contracts/sharded-multi-token/tests/utils_gclient/mod.rs index 86280ecb5..d024aa2c4 100644 --- a/contracts/sharded-multi-token/tests/utils_gclient/mod.rs +++ b/contracts/sharded-multi-token/tests/utils_gclient/mod.rs @@ -32,10 +32,24 @@ pub async fn setup_gclient() -> gclient::Result<(GearApi, ActorId)> { let user_fund = api.total_balance(api.account_id()).await? / 3; - api.transfer_keep_alive(user_account_0.as_ref().into(), user_fund) - .await?; - api.transfer_keep_alive(user_account_2.as_ref().into(), user_fund) - .await?; + api.transfer_keep_alive( + user_account_0 + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + user_fund, + ) + .await?; + api.transfer_keep_alive( + user_account_2 + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + user_fund, + ) + .await?; let storage_code_hash = upload_with_code_hash(&api, MT_STORAGE_WASM_PATH).await?; let mt_logic_code_hash = upload_with_code_hash(&api, MT_LOGIC_WASM_PATH).await?; diff --git a/contracts/staking/src/lib.rs b/contracts/staking/src/lib.rs index 873734652..585932851 100644 --- a/contracts/staking/src/lib.rs +++ b/contracts/staking/src/lib.rs @@ -52,7 +52,10 @@ impl Staking { payload, }; - let result = msg::send_for_reply_as(*token_address, payload, 0, 0)?.await?; + let result = msg::send_for_reply_as(*token_address, payload, 0, 0) + .unwrap() + .await + .unwrap(); if let FTokenEvent::Err = result { Err(Error::TransferTokens) diff --git a/contracts/staking/tests/panic_test.rs b/contracts/staking/tests/panic_test.rs index 4264292a2..4e5b85455 100644 --- a/contracts/staking/tests/panic_test.rs +++ b/contracts/staking/tests/panic_test.rs @@ -55,7 +55,7 @@ fn stake() { let sys = System::new(); init_staking(&sys); sys.init_logger(); - let staking = sys.get_program(1); + let staking = sys.get_program(1).unwrap(); let res = staking.send(5, StakingAction::Stake(0)); assert!(res.contains(&(5, Err::(Error::ZeroAmount).encode()))); @@ -66,7 +66,7 @@ fn update_staking() { let sys = System::new(); init_staking(&sys); sys.init_logger(); - let staking = sys.get_program(1); + let staking = sys.get_program(1).unwrap(); let res = staking.send( 5, @@ -110,7 +110,7 @@ fn send_reward() { init_staking_token(&sys); init_reward_token(&sys); sys.init_logger(); - let staking = sys.get_program(1); + let staking = sys.get_program(1).unwrap(); let res = staking.send(5, StakingAction::GetReward); @@ -128,7 +128,7 @@ fn withdraw() { let mut st_token = init_staking_token(&sys); init_reward_token(&sys); sys.init_logger(); - let staking = sys.get_program(1); + let staking = sys.get_program(1).unwrap(); let id: ActorId = staking.id().into_bytes().into(); st_token.approve(5, id, 1500); diff --git a/contracts/staking/tests/simple_test.rs b/contracts/staking/tests/simple_test.rs index 865c10ba5..9f4274ecd 100644 --- a/contracts/staking/tests/simple_test.rs +++ b/contracts/staking/tests/simple_test.rs @@ -137,7 +137,7 @@ fn stake() { let mut st_token = init_staking_token(&sys); init_reward_token(&sys); sys.init_logger(); - let staking = sys.get_program(1); + let staking = sys.get_program(1).unwrap(); let id: ActorId = staking.id().into_bytes().into(); st_token.approve(5, id, 1000); @@ -161,7 +161,7 @@ fn update_staking_test() { init_staking_token(&sys); init_reward_token(&sys); sys.init_logger(); - let staking = sys.get_program(1); + let staking = sys.get_program(1).unwrap(); let res = staking.send( 4, @@ -182,7 +182,7 @@ fn send_reward() { let mut st_token = init_staking_token(&sys); init_reward_token(&sys); sys.init_logger(); - let st = sys.get_program(1); + let st = sys.get_program(1).unwrap(); let time = sys.block_timestamp(); @@ -273,7 +273,7 @@ fn withdraw() { let mut st_token = init_staking_token(&sys); init_reward_token(&sys); sys.init_logger(); - let st = sys.get_program(1); + let st = sys.get_program(1).unwrap(); let time = sys.block_timestamp(); @@ -382,7 +382,7 @@ fn meta_tests() { let mut st_token = init_staking_token(&sys); init_reward_token(&sys); sys.init_logger(); - let st = sys.get_program(1); + let st = sys.get_program(1).unwrap(); let time = sys.block_timestamp(); diff --git a/contracts/student-nft/src/lib.rs b/contracts/student-nft/src/lib.rs index 733e3dcd4..74c1a44b8 100644 --- a/contracts/student-nft/src/lib.rs +++ b/contracts/student-nft/src/lib.rs @@ -2,10 +2,9 @@ use gstd::{ collections::{HashMap, HashSet}, - errors::Result as GstdResult, exec, msg, prelude::*, - ActorId, MessageId, + ActorId, }; use student_nft_io::*; @@ -484,21 +483,20 @@ extern fn handle() { } }; - reply(result).expect("Failed to encode or reply with `StudentNftEvent`."); + msg::reply(result, 0).expect("Failed to encode or reply with `StudentNftEvent`."); } #[no_mangle] extern fn state() { - reply(unsafe { - let student_nft = STUDENT_NFT - .as_ref() - .expect("Uninitialized `StudentNFT` state."); - let student_nft_state: StudentNftState = student_nft.into(); - student_nft_state - }) + msg::reply( + unsafe { + let student_nft = STUDENT_NFT + .as_ref() + .expect("Uninitialized `StudentNFT` state."); + let student_nft_state: StudentNftState = student_nft.into(); + student_nft_state + }, + 0, + ) .expect("Failed to share state."); } - -fn reply(payload: impl Encode) -> GstdResult { - msg::reply(payload, 0) -} diff --git a/contracts/student-nft/tests/utils_gclient/common.rs b/contracts/student-nft/tests/utils_gclient/common.rs index e700a72aa..3191f7a1b 100644 --- a/contracts/student-nft/tests/utils_gclient/common.rs +++ b/contracts/student-nft/tests/utils_gclient/common.rs @@ -24,9 +24,16 @@ pub async fn fund_users(api: &GearApi) -> gclient::Result<()> { for user in USERS { let user_id = get_user_to_actor_id(user).await?; - let user_program_id = user_id.encode().as_slice().into(); - api.transfer_keep_alive(user_program_id, amount).await?; + api.transfer_keep_alive( + user_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + amount, + ) + .await?; } Ok(()) diff --git a/contracts/student-nft/tests/utils_gclient/student_nft.rs b/contracts/student-nft/tests/utils_gclient/student_nft.rs index 3a171dd64..b93554f32 100644 --- a/contracts/student-nft/tests/utils_gclient/student_nft.rs +++ b/contracts/student-nft/tests/utils_gclient/student_nft.rs @@ -48,8 +48,15 @@ pub async fn mint(api: &GearApi, program_id: &ActorId, error: bool) -> gclient:: } pub async fn get_state(api: &GearApi, program_id: &ActorId) -> gclient::Result { - let program_id = program_id.encode().as_slice().into(); - api.read_state(program_id, vec![]).await + api.read_state( + program_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + vec![], + ) + .await } async fn send_message( diff --git a/contracts/supply-chain/src/utils.rs b/contracts/supply-chain/src/utils.rs index a1d7be39c..0caa4ba47 100644 --- a/contracts/supply-chain/src/utils.rs +++ b/contracts/supply-chain/src/utils.rs @@ -14,7 +14,7 @@ use sharded_fungible_token_io::{FTokenAction, FTokenEvent, LogicAction}; use supply_chain_io::*; fn send(actor: ActorId, payload: impl Encode) -> GstdResult> { - msg::send_for_reply_as(actor, payload, 0, 0) + Ok(msg::send_for_reply_as(actor, payload, 0, 0)?) } fn nft_event_to_transfer(event: GstdResult) -> Result { diff --git a/contracts/tamagotchi-battle/tests/node-test.rs b/contracts/tamagotchi-battle/tests/node-test.rs index e6f55829b..ccb2262be 100644 --- a/contracts/tamagotchi-battle/tests/node-test.rs +++ b/contracts/tamagotchi-battle/tests/node-test.rs @@ -125,7 +125,8 @@ async fn gclient_battle() -> Result<()> { .get_specific_actor_id(player) .encode() .as_slice() - .into(), + .try_into() + .expect("Unexpected invalid `ProgramId`."), amount, ) .await?; diff --git a/contracts/vara-man/tests/utils_gclient/common.rs b/contracts/vara-man/tests/utils_gclient/common.rs index fb62d5b64..9b6364d80 100644 --- a/contracts/vara-man/tests/utils_gclient/common.rs +++ b/contracts/vara-man/tests/utils_gclient/common.rs @@ -18,20 +18,27 @@ pub async fn init(api: &GearApi) -> gclient::Result { .await? .encode() .as_slice() - .into(); - api.transfer_keep_alive(destination, api.total_balance(api.account_id()).await? / 5) - .await?; - let destination = get_user_to_actor_id("//Alex") - .await? - .encode() - .as_slice() - .into(); + .try_into() + .expect("Unexpected invalid `ProgramId`."); api.transfer_keep_alive(destination, api.total_balance(api.account_id()).await? / 5) .await?; - let program_id_vara_man = vara_man.as_ref(); - let program_id_vara_man: ProgramId = program_id_vara_man.into(); api.transfer_keep_alive( - program_id_vara_man, + get_user_to_actor_id("//Alex") + .await? + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), + api.total_balance(api.account_id()).await? / 5, + ) + .await?; + + api.transfer_keep_alive( + vara_man + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."), api.total_balance(api.account_id()).await? / 5, ) .await?; diff --git a/contracts/vara-man/tests/utils_gclient/vara_man.rs b/contracts/vara-man/tests/utils_gclient/vara_man.rs index c6e0536b6..b79070287 100644 --- a/contracts/vara-man/tests/utils_gclient/vara_man.rs +++ b/contracts/vara-man/tests/utils_gclient/vara_man.rs @@ -252,7 +252,11 @@ pub async fn change_config( } pub async fn get_state(api: &GearApi, program_id: &ActorId) -> Option { - let program_id = program_id.encode().as_slice().into(); + let program_id = program_id + .encode() + .as_slice() + .try_into() + .expect("Unexpected invalid `ProgramId`."); let reply = api .read_state(program_id, StateQuery::All.encode()) .await diff --git a/contracts/xtask/src/main.rs b/contracts/xtask/src/main.rs index 8d13059ad..51c223930 100644 --- a/contracts/xtask/src/main.rs +++ b/contracts/xtask/src/main.rs @@ -5,7 +5,7 @@ use std::{ }; use xshell::Shell; -const NODE_LINK: &str = "https://get.gear.rs/gear-v1.1.0-x86_64-unknown-linux-gnu.tar.xz"; +const NODE_LINK: &str = "https://get.gear.rs/gear-v1.4.2-x86_64-unknown-linux-gnu.tar.xz"; fn main() -> Result<()> { let Some(command) = env::args().nth(1) else {