From 05c92fc6ce33925a93533f1e746e74f3d451f6c2 Mon Sep 17 00:00:00 2001 From: Costin Carabas Date: Fri, 10 May 2024 15:16:41 +0300 Subject: [PATCH] Framework upgrade 0.50 --- Cargo.lock | 862 +++++++++++------- growth-program/Cargo.toml | 26 +- growth-program/meta/Cargo.toml | 2 +- growth-program/output/growth-program.abi.json | 14 +- .../output/growth-program.mxsc.json | 16 +- growth-program/output/growth-program.wasm | Bin 20759 -> 21505 bytes growth-program/src/lib.rs | 2 +- growth-program/wasm/Cargo.lock | 112 +-- growth-program/wasm/Cargo.toml | 5 +- growth-program/wasm/src/lib.rs | 5 +- metabonding/Cargo.toml | 8 +- metabonding/meta/Cargo.toml | 2 +- metabonding/wasm/Cargo.lock | 64 +- metabonding/wasm/Cargo.toml | 5 +- metabonding/wasm/src/lib.rs | 2 - pair-mock/Cargo.toml | 4 +- pair-mock/meta/Cargo.toml | 2 +- pair-mock/wasm/Cargo.lock | 56 +- pair-mock/wasm/Cargo.toml | 5 +- pair-mock/wasm/src/lib.rs | 2 - router-mock/Cargo.toml | 4 +- router-mock/meta/Cargo.toml | 2 +- router-mock/output/router-mock.abi.json | 4 +- router-mock/output/router-mock.mxsc.json | 6 +- router-mock/output/router-mock.wasm | Bin 894 -> 893 bytes router-mock/wasm/Cargo.lock | 56 +- router-mock/wasm/Cargo.toml | 5 +- router-mock/wasm/src/lib.rs | 2 - 28 files changed, 736 insertions(+), 537 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0760fc..ae3dbcd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,58 +27,71 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -86,9 +99,18 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" + +[[package]] +name = "arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "arrayvec" @@ -98,15 +120,15 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -119,9 +141,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bech32" @@ -156,9 +178,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block-buffer" @@ -180,9 +202,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -190,9 +212,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -202,18 +224,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4" [[package]] name = "cfg-if" @@ -223,9 +242,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.13" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -233,9 +252,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.12" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -245,9 +264,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck", "proc-macro2", @@ -257,15 +276,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "colored" @@ -286,7 +305,7 @@ checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" [[package]] name = "common-types" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -294,7 +313,7 @@ dependencies = [ [[package]] name = "common_errors" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -302,7 +321,7 @@ dependencies = [ [[package]] name = "common_structs" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "fixed-supply-token", "math", @@ -356,43 +375,37 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -417,6 +430,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "derive_arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "digest" version = "0.9.0" @@ -437,6 +461,17 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ed25519" version = "1.5.3" @@ -462,15 +497,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -484,7 +519,7 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "energy-factory" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_structs", "legacy_token_decode_module", @@ -501,7 +536,7 @@ dependencies = [ [[package]] name = "energy-query" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "energy-factory", "multiversx-sc", @@ -515,9 +550,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -525,14 +560,14 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fees-collector" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common-types", "common_errors", @@ -551,16 +586,16 @@ dependencies = [ [[package]] name = "fixed-supply-token" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -603,6 +638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -637,6 +673,7 @@ checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-io", + "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -667,9 +704,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -726,9 +763,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" dependencies = [ "bytes", "fnv", @@ -745,21 +782,24 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -784,9 +824,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -795,12 +835,24 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", + "futures-core", "http", + "http-body", "pin-project-lite", ] @@ -810,47 +862,60 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "hyper" -version = "0.14.28" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", + "http-body-util", "hyper", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -865,9 +930,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ "crossbeam-deque", "globset", @@ -881,9 +946,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -895,6 +960,12 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + [[package]] name = "itertools" version = "0.10.5" @@ -906,33 +977,33 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -946,7 +1017,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "legacy_token_decode_module" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_structs", "multiversx-sc", @@ -955,21 +1026,21 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -978,37 +1049,35 @@ dependencies = [ [[package]] name = "locking_module" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ - "energy-factory", "multiversx-sc", - "simple-lock", ] [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "math" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mergeable" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -1043,18 +1112,18 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -1078,16 +1147,16 @@ dependencies = [ [[package]] name = "multiversx-chain-vm" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a363734a77774f4095fad6f49c6772b82edd833ed47a7c1ca87db18f68ccfffd" +checksum = "f69520691466bc184475320c27db21137e68be5e959df25c1a14b09e055d0d58" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "colored", "ed25519-dalek", "hex", "hex-literal", - "itertools 0.12.0", + "itertools 0.12.1", "multiversx-chain-vm-executor", "num-bigint", "num-traits", @@ -1105,33 +1174,35 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f" [[package]] name = "multiversx-sc" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1291e3712731f4e34775254e9a9b8ff70132d15414f2e51f9bc82c23faf48c" +checksum = "0c9624cfb01497bf386d6b8837fa8e6785d45c8d4e122ba9c31060ecf5fce413" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "hex-literal", "multiversx-sc-codec", "multiversx-sc-derive", "num-traits", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1da6db65170105c9495848c5e4ba388abb1f9201ff2ca362056c9328f36b7760" +checksum = "35c94397b2fba14e40edfa55905b3f453ed57aa06c9b1960ad6a0ca6bfb7a236" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", "num-bigint", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631c4d4b37fc94659c8d6cf559c21b68c68899095201de2e1b779fccad7b0b03" +checksum = "cf72a8042da0bc19da0b8f0d4f61b4c66ae853560fefc69cd8fea87bf1aa8c14" dependencies = [ "hex", "proc-macro2", @@ -1141,9 +1212,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f0331893be2b757401b2deaf7d8b8c90745fa69114000d83fe26d8487d35a5" +checksum = "754cdc20001c3b51df75784c5d8ce454697d0e86264f1d88da392ea211f662f9" dependencies = [ "hex", "proc-macro2", @@ -1154,9 +1225,9 @@ dependencies = [ [[package]] name = "multiversx-sc-meta" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add1bda75ed39bdb246097e5233a4ed7af6587f7c06a7e5084742199d685f6ab" +checksum = "1685ec123bf256310f876db64f63a19ce0df9721857981a4910f26c48ddf3dc6" dependencies = [ "clap", "colored", @@ -1174,32 +1245,32 @@ dependencies = [ "serde", "serde_json", "toml", - "wasmparser 0.121.2", + "wasmparser", "wasmprinter", "zip", ] [[package]] name = "multiversx-sc-modules" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e507a180afcab409cc3d920bc12f3852cf481a6657428879d1a70f6c2666c94" +checksum = "25824610adec5b01c7b38cd469983940b33a7d11b2c0011af7ad572fe10ac1ae" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-scenario" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42dea5dcc79ef692e907d919ca6bffc81a07c84af977e98b4192c2fd4ff2c67f" +checksum = "25f9434d86800639499dc899c4220f615c4a2aa1a998a56d2d635cd4b5fea851" dependencies = [ "base64", "bech32", "clap", "colored", "hex", - "itertools 0.12.0", + "itertools 0.12.1", "log", "multiversx-chain-scenario-format", "multiversx-chain-vm", @@ -1214,13 +1285,14 @@ dependencies = [ "serde_json", "sha2 0.10.8", "tokio", + "unwrap-infallible", ] [[package]] name = "multiversx-sdk" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46d709ddf46c50a407ce4b90ff487e854926d47f80de6abfe4a4adca3eaa7964" +checksum = "5cb2f8dd4a17ce9c9fa1ab3d80152929702968be6536499f32bd7e2278c2e0fb" dependencies = [ "anyhow", "base64", @@ -1228,7 +1300,7 @@ dependencies = [ "bip39", "hex", "hmac", - "itertools 0.12.0", + "itertools 0.12.1", "pbkdf2", "pem", "rand 0.8.5", @@ -1271,30 +1343,28 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1332,11 +1402,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -1364,9 +1434,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -1377,7 +1447,7 @@ dependencies = [ [[package]] name = "pair" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_errors", "common_structs", @@ -1409,9 +1479,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -1419,15 +1489,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -1439,7 +1509,7 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pausable" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", "permissions_module", @@ -1456,9 +1526,9 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ "base64", "serde", @@ -1473,18 +1543,38 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissions_module" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "common_errors", "multiversx-sc", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1494,9 +1584,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "ppv-lite86" @@ -1506,18 +1596,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1591,7 +1681,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.15", ] [[package]] @@ -1614,18 +1704,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -1635,9 +1725,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -1646,26 +1736,29 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.11.23" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -1674,9 +1767,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -1691,12 +1786,14 @@ dependencies = [ [[package]] name = "router" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ + "common_structs", "locking_module", "multiversx-sc", "pair", "pausable", + "permissions_module", "simple-lock", "token_send", ] @@ -1734,9 +1831,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -1749,22 +1846,38 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys", "windows-sys 0.52.0", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -1778,7 +1891,7 @@ dependencies = [ [[package]] name = "sc_whitelist_module" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_errors", "multiversx-sc", @@ -1801,11 +1914,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -1814,9 +1927,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -1824,24 +1937,24 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.194" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.194" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", @@ -1850,9 +1963,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "indexmap", "itoa", @@ -1862,9 +1975,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", @@ -1928,9 +2041,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -1944,7 +2057,7 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "simple-lock" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_structs", "multiversx-sc", @@ -1962,25 +2075,25 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -1990,15 +2103,21 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.48" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "system-configuration" version = "0.5.1" @@ -2022,17 +2141,36 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] +[[package]] +name = "thiserror" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -2051,7 +2189,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token_send" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_errors", "common_structs", @@ -2060,9 +2198,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.35.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -2100,23 +2238,22 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "indexmap", "serde", @@ -2136,9 +2273,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap", "serde", @@ -2147,6 +2284,28 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -2159,6 +2318,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-core", ] @@ -2186,9 +2346,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2207,14 +2367,20 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unwrap-infallible" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb" [[package]] name = "unwrappable" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -2239,7 +2405,7 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_structs", "fixed-supply-token", @@ -2261,9 +2427,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2292,9 +2458,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2302,9 +2468,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -2317,9 +2483,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -2329,9 +2495,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2339,9 +2505,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -2352,46 +2518,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" - -[[package]] -name = "wasmparser" -version = "0.118.1" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" -dependencies = [ - "indexmap", - "semver", -] +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasmparser" -version = "0.121.2" +version = "0.207.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" +checksum = "e19bb9f8ab07616da582ef8adb24c54f1424c7ec876720b7da9db8ec0626c92c" dependencies = [ - "bitflags 2.4.2", + "ahash", + "bitflags 2.5.0", + "hashbrown", "indexmap", "semver", ] [[package]] name = "wasmprinter" -version = "0.2.75" +version = "0.207.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c" +checksum = "9c2d8a7b4dabb460208e6b4334d9db5766e84505038b2529e69c3d07ac619115" dependencies = [ "anyhow", - "wasmparser 0.118.1", + "wasmparser", ] [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2400,7 +2558,7 @@ dependencies = [ [[package]] name = "week-timekeeping" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common-types", "multiversx-sc", @@ -2409,7 +2567,7 @@ dependencies = [ [[package]] name = "weekly-rewards-splitting" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common-types", "energy-query", @@ -2419,37 +2577,15 @@ dependencies = [ "week-timekeeping", ] -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-sys" version = "0.48.0" @@ -2465,7 +2601,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -2485,17 +2621,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "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", ] [[package]] @@ -2506,9 +2643,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2518,9 +2655,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2530,9 +2667,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2542,9 +2685,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2554,9 +2697,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2566,9 +2709,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2578,29 +2721,49 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.5.32" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", ] +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zeroize" version = "1.7.0" @@ -2623,12 +2786,15 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.6" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "ed14a57c18714abaa03196c0714ed36bab969d7457f72d12fb5c2e1ced4c24ae" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", "crossbeam-utils", + "displaydoc", "flate2", + "indexmap", + "thiserror", ] diff --git a/growth-program/Cargo.toml b/growth-program/Cargo.toml index 7289c5e..0424371 100644 --- a/growth-program/Cargo.toml +++ b/growth-program/Cargo.toml @@ -9,31 +9,35 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.48.0" +version = "=0.50.0" features = ["esdt-token-payment-legacy-decode"] [dependencies.multiversx-sc-modules] -version = "=0.48.0" +version = "=0.50.0" [dependencies.utils] git = "https://github.com/multiversx/mx-exchange-sc" -rev = "27085fb" +rev = "2c5a2d9" [dependencies.router] git = "https://github.com/multiversx/mx-exchange-sc" -rev = "27085fb" +rev = "2c5a2d9" [dependencies.pair] git = "https://github.com/multiversx/mx-exchange-sc" -rev = "27085fb" +rev = "2c5a2d9" [dependencies.energy-query] git = "https://github.com/multiversx/mx-exchange-sc" -rev = "27085fb" +rev = "2c5a2d9" [dependencies.simple-lock] git = "https://github.com/multiversx/mx-exchange-sc" -rev = "27085fb" +rev = "2c5a2d9" + +[dependencies.energy-factory] +git = "https://github.com/multiversx/mx-exchange-sc" +rev = "2c5a2d9" [dev-dependencies] num-bigint = "0.4.2" @@ -42,17 +46,13 @@ hex = "0.4" hex-literal = "0.4.1" [dev-dependencies.multiversx-sc-scenario] -version = "=0.48.0" +version = "=0.50.0" [dev-dependencies.multiversx-sc-modules] -version = "=0.48.0" +version = "=0.50.0" [dev-dependencies.pair-mock] path = "../pair-mock" [dev-dependencies.router-mock] path = "../router-mock" - -[dependencies.energy-factory] -git = "https://github.com/multiversx/mx-exchange-sc" -rev = "27085fb" diff --git a/growth-program/meta/Cargo.toml b/growth-program/meta/Cargo.toml index c2c005b..02872c2 100644 --- a/growth-program/meta/Cargo.toml +++ b/growth-program/meta/Cargo.toml @@ -8,5 +8,5 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "=0.48.0" +version = "=0.50.0" default-features = false diff --git a/growth-program/output/growth-program.abi.json b/growth-program/output/growth-program.abi.json index a85c727..820f612 100644 --- a/growth-program/output/growth-program.abi.json +++ b/growth-program/output/growth-program.abi.json @@ -10,11 +10,11 @@ "contractCrate": { "name": "growth-program", "version": "0.0.0", - "gitVersion": "v1.0.2-174-g56a7b35" + "gitVersion": "v1.0.2-176-gf36b29a" }, "framework": { "name": "multiversx-sc", - "version": "0.48.0" + "version": "0.50.0" } }, "name": "GrowthProgram", @@ -72,13 +72,11 @@ ], "outputs": [] }, + "upgradeConstructor": { + "inputs": [], + "outputs": [] + }, "endpoints": [ - { - "name": "upgrade", - "mutability": "mutable", - "inputs": [], - "outputs": [] - }, { "name": "addProject", "onlyOwner": true, diff --git a/growth-program/output/growth-program.mxsc.json b/growth-program/output/growth-program.mxsc.json index 80ca425..1663b82 100644 --- a/growth-program/output/growth-program.mxsc.json +++ b/growth-program/output/growth-program.mxsc.json @@ -13,7 +13,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.48.0" + "version": "0.50.0" } }, "abi": { @@ -72,13 +72,11 @@ ], "outputs": [] }, + "upgradeConstructor": { + "inputs": [], + "outputs": [] + }, "endpoints": [ - { - "name": "upgrade", - "mutability": "mutable", - "inputs": [], - "outputs": [] - }, { "name": "addProject", "onlyOwner": true, @@ -910,8 +908,8 @@ } } }, - "size": 20759, - "code": "0061736d0100000001a8011b60000060017f017f60027f7f0060027f7f017f6000017f60017f0060037f7f7f0060037f7f7f017f60047f7f7f7f0060027f7e0060047f7f7f7f017f60057f7f7f7f7f0060027f7e017f60017f017e6000017e60027f7f017e60017e0060017e017f60057f7f7e7f7f017f60067e7f7f7f7f7f017f60057e7f7f7f7f017f60047f7f7f7e0060047f7e7f7f0060027e7f0060037f7f7e017f60047f7f7f7e017f60037f7e7f017f02bb093303656e760e626967496e74536574496e743634000903656e7609626967496e74416464000603656e760b7369676e616c4572726f72000203656e760a6d4275666665724e6577000403656e760d6d427566666572417070656e64000303656e76096d4275666665724571000303656e760d6d42756666657246696e697368000103656e76106d4275666665724765744c656e677468000103656e76226d616e616765644d756c74695472616e73666572455344544e465445786563757465001203656e761b6d616e61676564457865637574654f6e44657374436f6e74657874001303656e760d6d616e6167656443616c6c6572000503656e76106d616e61676564534341646472657373000503656e76136d616e616765644f776e657241646472657373000503656e760f6d4275666665724765744279746573000303656e760f6973536d617274436f6e7472616374000103656e76126d427566666572476574417267756d656e74000303656e76126d427566666572417070656e644279746573000703656e76126d616e616765645369676e616c4572726f72000503656e761b736d616c6c496e74476574556e7369676e6564417267756d656e74000d03656e7619626967496e74476574556e7369676e6564417267756d656e74000203656e7611676574417267756d656e744c656e677468000103656e760f6765744e756d417267756d656e7473000403656e7614626967496e7446696e697368556e7369676e6564000503656e7614736d616c6c496e7446696e6973685369676e6564001003656e7609626967496e74537562000603656e7609626967496e74436d70000303656e760f6d4275666665725365744279746573000703656e760a626967496e7454446976000603656e7609626967496e744d756c000603656e76196d42756666657246726f6d426967496e74556e7369676e6564000303656e76176d427566666572546f426967496e74556e7369676e6564000303656e7609626967496e74506f77000603656e760a626967496e7453717274000203656e76146d427566666572436f707942797465536c696365000a03656e76126d42756666657253746f726167654c6f6164000303656e76136d42756666657253746f7261676553746f7265000303656e760a6765744761734c656674000e03656e760f636c65616e52657475726e44617461000003656e7611676574426c6f636b54696d657374616d70000e03656e761d6d42756666657253746f726167654c6f616446726f6d41646472657373000603656e761c6d616e616765644765744d756c74694553445443616c6c56616c7565000503656e761776616c6964617465546f6b656e4964656e746966696572000103656e760e636865636b4e6f5061796d656e74000003656e760f6d616e6167656457726974654c6f67000203656e7616736d616c6c496e7446696e697368556e7369676e6564001003656e76146d616e6167656456657269667945643235353139000703656e760d676574426c6f636b45706f6368000e03656e76156d427566666572546f426967496e745369676e6564000303656e7609626967496e74416273000203656e760a626967496e745369676e000103656e76136d42756666657247657442797465536c696365000a03f201f00101040411090103050102040204030501010102010202010201040214040404000108070207070701010707050505000501050106010b060201090b0a030f0815080b020b09010a010108020b0f020706010302030303020101030c110101040201010a08080a080002020202050103020202160602020901020d010101030c170f090c0c020203010907071804040419040b0d02050201040108040303010403040401030303030403040505040508000403050402020202060504010505010604060c0c1a0404000000000000000000000000000000000000000000000000000000000000000000000000000000000005030100030616037f01418080080b7f004181e2080b7f004190e2080b07e8062b066d656d6f7279020004696e697400fa01077570677261646500fb010a61646450726f6a65637400fc010f73657450726f6a6563744f776e657200fd010c706175736550726f6a65637400fe010e756e706175736550726f6a65637400ff010f697350726f6a656374416374697665008002137365744d696e52657761726473506572696f64008102187365744d696e5765656b6c795265776172647356616c7565008202156465706f736974496e697469616c52657761726473008302186465706f7369744164646974696f6e616c526577617264730084021773657446656573436f6c6c6563746f7241646472657373008502146f776e65725769746864726177526577617264730086020d66696e69736850726f6772616d0087021c7365744d696e526577617264446f6c6c617273506572456e657267790088020f73657446697273745765656b4170720089020e676574496e697469616c52647065008a02217365744e6578745765656b526577617264446f6c6c617273506572456e65726779008b0208736574416c706861008c020773657442657461008d021c736574546f74616c456e65726779466f7243757272656e745765656b008e021c676574546f74616c456e65726779466f7243757272656e745765656b008f020c636c61696d52657761726473009002176765744578656d707465645061727469636970616e74730091020e67657455736572436c61696d65640092020d757064617465526577617264730093020e67657452657761726473496e666f0094021567657452657761726473546f74616c416d6f756e74009502196765745265776172647352656d61696e696e67416d6f756e740096020f6765744e6f746573486973746f72790097020c6368616e67655369676e65720098020e67657443757272656e745765656b0099021e67657454696d657374616d70735374617274416e64456e644f665765656b009a021a67657446697273745765656b537461727454696d657374616d70009b0217736574456e65726779466163746f727941646472657373009c0217676574456e65726779466163746f727941646472657373009d02057061757365009e0207756e7061757365009f0208697350617573656400a0020863616c6c4261636b00a1020a5f5f646174615f656e6403010b5f5f686561705f6261736503020ae97af0011601017f1034220142001000200120012000100120010b1901017f41c0930841c0930828020041016b220036020020000b0e01017f10342200420a100020000b0e01017f103422012000103720010b19002001420053044041f5820841111002000b2000200110000b0f01017f10032201200010041a20010b0b0020002001100541004a0b19002000103b45044041f58008410f103c000b103d2000103e0b1400200041e1e108100d1a41e1e108100e41004a0b0900200020011002000b0a0041ca8c08411410400b090020002001109d010b0a0041989208410010400b1101017f1034220220002001101a1a20020b0700200010061a0b08002000104310440b7001047f230041106b220124002001410036020c20002001410c6a2202410441db8208410b107e200120002802082000280200220320024104107fa72202107c2001280200410147044041db8208410b41e68208410f1054000b20012802042000200220036a360200200141106a24000b0d00200010342200101e1a20000b0a0020001046200110470b0f01017f103422012000101d1a20010b5101027f230041106b22022400200220001007220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a410410820120012000108501200241106a24000b3701017f20011049220210072101200041106a41003a00002000410c6a20013602002000200236020820002001360204200041003602000b0d0020001034220010221a20000b6902057f017e200128020c2204104b45044020012903002107104c2105104c21062001280208230041106b22012400104c21031038210220012004103336020c200120073703002001200236020820032001104d2000200342002005200610081a200141106a24000b0b0c00200010830141ff0171450b1301017f10342200419892084100101a1a20000bd20102027f017e230041106b2203240020032001280208220241187420024180fe03714108747220024108764180fe0371200241187672723602002003200128020c220241187420024180fe03714108747220024108764180fe03712002411876727236020c20032001290300220442388620044280fe0383422886842004428080fc0783421886200442808080f80f834208868484200442088842808080f80f832004421888428080fc07838420044228884280fe0383200442388884848437020420002003411010101a200341106a24000b1500200020012002200320041034220110091a20010b0c01017f10342200100a20000b0c01017f10342200100b20000b0c01017f10342200100c20000b15001051104f103904400f0b41fc920841241002000b0d00200010342200100f1a20000b2e01017f41a681084117104022042000200110101a200441bd8108410310101a20042002200310101a20041011000b0c00200020012002105710530b4601017f230041106b220224002002200141187420014180fe03714108747220014108764180fe03712001411876727236020c20002002410c6a410410101a200241106a24000b2f01017f2000280200220341dce1082802004e04402001200241c0810841111054000b2000200341016a36020020030b2501017e20001012220342ffffffff0f5804402003a70f0b2001200241998008410e1054000b1f00200010532200100741204704402001200241f18b0841101054000b20000b2601017e2000101222014280808080105a0440418a8408410a41998008410e1054000b2001a70b0c00200010342200101320000b0a0020002001200210580b2f01017f230041106b22032400200341003a000f20002003410f6a410120012002107e20032d000f200341106a24000b1900200041dce1082802004e04400f0b41d1810841121002000b1400101520004604400f0b41e3810841191002000b1900200041dce1082802004c04400f0b41c0810841111002000b0b0041dce10810153602000b08002000106310160b08002000104910440b090020001065ad10170b2f01017e027f0240200010ac012201420158044041002001a741016b0d021a0c010b41898c084112107d000b41010b0b1f0020002001200210182000106741ff017104400f0b41fc810841301002000b1500410241012000103122001b4100200041004e1b0b9f0202087f017e230041406a22052400200541206a41ac82084114106920052802202108200528022422062003106a2004106b2103104c22092003ad106c20062009105620041007210a200541306a210b410021030340200a200341106a220949044020052008200620012002106d200528020421012000200528020036020020002001360204200541406b240005200b42003703002005420037032820042003200541286a22074110106e1a2005410036023c20072005413c6a220c106f21032007200c1070210d200541286a2005413c6a106f2107200541186a2008200620031071200541106a2005280218200528021c200d1072200541086a2005280210200528021420071073200528020c210620052802082108200921030c010b0b0b180020012002104021012000104c360204200020013602000b1000104c1a20002001280200103810560b0900200010074104760b3801017f230041106b2202240020024200370308200220014100200241086a10a501200020022802002002280204101a1a200241106a24000b900101037f230041106b220524000240200310780d00200220031075200410072106410021030340200341046a220720064b0d012005410036020c200420032005410c6a410410791a2002200528020c220341187420034180fe03714108747220034108764180fe0371200341187672721075200721030c000b000b2000200236020420002001360200200541106a24000b0f00200020012003200210324100470b7301017f230041106b220224002002410036020c2002200020012802002200200041046a22001096012002410c6a41042002280200200228020410970120012000360200200228020c2100200241106a2400200041187420004180fe03714108747220004108764180fe0371200041187672720ba70102017e017f230041106b22032400200342003703082003200020012802002200200041086a2200109601200341086a4108200328020020032802041097012001200036020020032903082102200341106a2400200242388620024280fe0383422886842002428080fc0783421886200242808080f80f834208868484200242088842808080f80f832002421888428080fc07838420024228884280fe038320024238888484840b160020022003107520002002360204200020013602000b160020022003107720002002360204200020013602000b1b00104c1a200220031046105620002002360204200020013602000b9c0101027f230041306b22052400200541286a41c08208410f1069200541206a2005280228200528022c20042802081071200541186a2005280220200528022420042903001072200541106a2005280218200528021c200428020c1073200528021021042005280214220620031075200541086a2004200620012002106d200528020c21012000200528020836020020002001360204200541306a24000b0d00104c1a20002001103810560b7101017f230041206b22052400200541186a41cf8208410c1069200541106a2005280218200528021c20031071200541086a200528021020052802142004107320052005280208200528020c20012002106d200528020421012000200528020036020020002001360204200541206a24000b1201017f104c22022001106c2000200210560b070020001007450b0c002000200120022003106e0b5201047f230041106b220124002000107b2102200141086a2000280208200028020022032002107c2001280208410147044041e68208410f107d000b200128020c2000200220036a360200200141106a24000b5402017f017e230041106b220124002001410036020c200041086a20002802002001410c6a4104109801044041e68208410f107d000b2000200028020041046a3602002001410c6a4104107f200141106a2400a70b1f0020012002200310032201102121022000200136020420002002453602000b1a01017f41ea83084116104022022000200110101a20021011000b1c002000200120022003200410c4012000200028020020026a3602000b3401017e02402001450d0003402001450d01200141016b210120003100002002420886842102200041016a21000c000b000b20020b920101037f230041106b220224002002410036020c024020012002410c6a4104108101220345044020022001280208200128020022032002410c6a4104107fa72204107c2000027f20022802004101460440200020022802043602042001200320046a36020041000c010b2000410f36020441e682080b3602000c010b2000410f360204200020033602000b200241106a24000b3201017f41e682082103200041086a200028020020012002109801047f41e68208052000200028020020026a36020041000b0b0b0020002001200210101a0b09002000106741016b0b1500417f200020011019220041004720004100481b0b09002000200110041a0b0c00200020002001100120000b0c00200020002001101b20000b0c00200020002001101c20000b0a0020002000200110010b11002000200041a08d06108b01101b20000b0b0041722000ad100041720b0f00200020002001108b01101c20000b0f00200020002001108e01101c20000b0a0041722000103741720b1301017f1034220120004106108b01101f20010b0e01017f103422012000102020010b0e01017f103422004200100020000b810102047f017e230041206b22022400200241106a42003703002002420037030820014100200241086a2203411010792002410036021c20032002411c6a2204106f21052003200410702106200241086a2002411c6a106f2103044041868308411d1002000b2000200336020c2000200536020820002006370300200241206a24000b1900200041feffffff074604404180800841191002000b20000b5f01027f230041206b22012400200010074120460440200141186a4200370300200141106a4200370300200141086a4200370300200142003703002000410020014120106e1a2001412041a38308412010950121020b200141206a240020020b5301027f2001200346047f4100210302402001450d00034020002d0000220420022d00002205460440200041016a2100200241016a2102200141016b22010d010c020b0b200420056b21030b20030541010b450b31000240200220034d0440200341104b0d012000200320026b3602042000200120026a3602000f0b109a01000b109a01000bb60201067f200120034604402001220341104f04402000410020006b41037122046a210520040440200221010340200020012d00003a0000200141016a2101200041016a22002005490d000b0b2005200320046b2203417c7122066a21000240200220046a22044103710440200641004c0d012004410374220141187121072004417c71220841046a2102410020016b4118712109200828020021010340200520012007762002280200220120097472360200200241046a2102200541046a22052000490d000b0c010b200641004c0d0020042102034020052002280200360200200241046a2102200541046a22052000490d000b0b20034103712103200420066a21020b20030440200020036a21010340200020022d00003a0000200241016a2102200041016a22002001490d000b0b0f0b109a01000bd20101037f230041106b2204240002400240027f024020002d000845044020002802002205100722064190ce004b0d0141d8e1082d00000d0141d4e108200636020041d8e10841013a0000200441086a41c493084190ce002006109901200541002004280208200428020c10791a200041013a00080b4101200120036a220041d4e1082802004b0d011a20002001490d0220004190ce004b0d0320022003200141c493086a200310970141000c010b200041003a0008200520012002200310790b200441106a24000f0b109a01000b109a01000b1c0020022003490440109a01000b20002003360204200020013602000b060010a202000b3f01017f103f210220012802002002104720012802042002104520012802082002109c01200128020c2002109c0120012802102002109c0120002002109d010b4601017f230041106b220224002002200041187420004180fe03714108747220004108764180fe03712000411876727236020c20012002410c6a4104108201200241106a24000b09002000200110231a0b0b0020002001104610231a0b1400416c419892084100101a1a2000416c10231a0b2101017e200010ac0122014280808080105a044041998008410e107d000b2001a70b1a0020001038220041d48308410510101a2001200010a20120000b090020002001109c010b090020002001109e010b3901017f230041106b220224002002420037030820022001ad4101200241086a10a50120002002280200200228020410a601200241106a24000b9e0202047f027e2003200142388620014280fe0383422886842001428080fc0783421886200142808080f80f834208868484200142088842808080f80f832001421888428080fc07838420014238882208200142288822094280fe0383848484370000200041084100200142005322072002716b41ff017122042008a746220520042001423088a741ff01714671220620056a20042009a741ff01714620067122056a20042001422088a741ff01714620057122056a200520042001a72205411876467122066a2004200541107641ff01714620067122066a2004200541087641ff01714620067122046a2004200150716a22042007200320044107716a2c0000410048732004410047712002716b22026b3602042000200220036a3602000b0d00200020012002104010231a0b080020002001103e0b0a0020002001ad10a9010b3801017f230041106b2202240020024200370308200220014100200241086a10a50120002002280200200228020410a601200241106a24000b0d01017f200010632000109f010ba00101057f230041206b220224002002410c6a2203200110482003107a21012002410c6a107a104421042003107b21032002410c6a107b21052002410c6a107b21062002280210200228020c4604402002411c6a2d0000044041d4e108410036020041d8e10841003a00000b200020063602102000200536020c200020033602082000200436020420002001360200200241206a24000f0b41998008410e107d000b5d02027f017e230041106b22012400200142003703082000104922001007220241094f044041998008410e107d000b2001200141086a200210eb01200041002001280200220020012802042202106e1a20002002107f200141106a24000b0800200010ae01450b0d002000416710221a416710070b130020001038220041aa9308410610101a20000b1a0020001038220041a69308410410101a2000200110850120000b1a0020001038220041a09308410610101a2001200010b20120000b7801017f230041106b220224002002200042388620004280fe0383422886842000428080fc0783421886200042808080f80f834208868484200042088842808080f80f832000421888428080fc07838420004228884280fe038320004238888484843703082001200241086a4108108201200241106a24000b0c002000200110b00110ac010b5001037f20002802082203200110b5014504402000280204220210a00121042000280200200441016a220010a101200110a90120022000ad10a901200210a00121002003200110b6012000ad10a9010b0b0f002000200110b60110a0014100470b1a0020001038220041e48308410610101a2001200010b20120000b080020002001106a0b1301017f104c22022001ad106c2000200210560b1201017f104c2202200020011040105620020b1b002000104922001007412047044041f18b084110107d000b20000b2201017f1034220242001000200010910136020c20002001370300200020023602080b910101037f230041106b2203240020001093012104419d9008410710402105104c220020011075200020021075109101210110242004200120052000104e210010252000100721012003410036020c2003200036020420032001410276360208200341046a41db8208410b10bd01103822001007412047044041db8208410b41f18b0841101054000b200341106a240020000b7b01027f230041106b22032400200028020821042003410036020c200028020020044102742003410c6a41041079450440200328020c21012000200441016a360208200141187420014180fe03714108747220014108764180fe0371200141187672721038200341106a24000f0b2001200241c0810841111054000b8f0101057f20001038210310bf011049210410c0011049210510c10110ba0122061038200310382004103810bc01220710940145044020062004200510bc012203109401044041948408412b103c000b200310bf011049200720002001200210c201200210c2010f0b20062003200510bc012203109401450440200320002001200210c2010f0b41bf8408412b103c000b0a0041ef8e08410c10400b0a0041d78e08410b10400b0a0041e28e08410d10400bd10201047f230041306b2204240010c30110ba01109301210641ad8c08411d10402107104c2205200010752005200310772001104c1038220010474200200010b201200220001045200520001056109101210010242006200020072005104e21001025200010072101200441003602142004200036020c200420014102763602102004410c6a41db8208410b10bd01220110072100200441286a41003a0000200441246a2000360200200420013602202004200036021c200441003602182004410036022c200441186a2004412c6a410441db8208410b10c401024020042d002f044020042d002c450d010b200441186a41db8208410b105d1a0b200441186a220010431a200010c5011a200010422100200428021c200428021846044020042d0028044041d4e108410036020041d8e10841003a00000b200441306a240020000f0b41db8208410b41998008410e1054000b0a0041fb8e08410d10400b2300200041086a20002802002001200210980104402003200441e68208410f1054000b0b3602017f017e230041106b22012400200142003703082000200141086a2200410841db8208410b107e20004108107f200141106a24000b1800200010c701104f200010c801200010c901200110a4010b170010ca0110a0012000490440418986084112103c000b0b2a01017f1051210202402000200110cb0110ba0110390d002000200210390d00419b86084135103c000b0b1300200041aa8e08410d10402200109c0120000b0a0041b78e08410d10400b13002000419e8e08410c10402200109c0120000bd90101047f024010cd0122052003280208490d00200328020c220420054f0d00200420032802102206460d002005200220046a2202200520022005491b20011b2205200620052006491b22012004200120044b1b210710910121020340200420074604400240200520064f0440200328020420021089010c010b2000200110ce0122041063220520021089012004200510a3012000200110cf0122041063220520021089012004200510a3010b2003200136020c0520022000200410ce0110aa01108901200441016a21040c010b0b0b200010d0012003109b010b2b01027e1026220010d10110ac01220154044041c49208411a103c000b200020017d4280f52480a741016a0b1a00200041d39108411610402200109c012001200010a20120000b1a00200041ac9108411210402200109c012001200010a20120000b1300200041919108410b10402200109c0120000b0a0041e99108411710400b1b002000200141ff0171410274418092086a280200108c01108a010b840101027f4280c8afa025103642808090bbbad6adf00d108d01210141a29208411010402100103d10ba0120004167102741671038200110334280a30510be01210010d4011063200010880142808090bbbad6adf00d108d0142808090bbbad6adf00d108d011035108f0141a08d06108c014134108c0142a00b108d0120011088011087010b0a0041888f08410c10400bbc0301097f230041306b2204240010cd012101200041948f08411210402205109c012001200510a2010240200510ad014504402005106321000c010b200441086a200010d00110ab012000200110cf0110632101200428020820014280a30510be0121090240200010cd01220310d601220710ad014504402007106321010c010b2000200341016b220210d70110632000200210d801106310860121082000200210d901106321062000200210d70110632201104b45044020062000200210d8011063200610880120011087011086011a0b10da01106321012008104b0d002006104b0d002004411c6a200010d00110ab012000200310cf0110632103200428021c20034280a30510be0121032000200210db01106320031088011090012100200820061088011090012102200710dc01106342808090bbbad6adf00d108d0142808090bbbad6adf00d108d012000108801200241a08d06108c011087011035108f01108701220020012000200110840141ff01714101461b2201109e010b20011035108f0110880121002005200942808090bbbad6adf00d108d0142808090bbbad6adf00d108d0120001087012200109e010b200441306a240020000b1a00200041b38f08411310402200109c012001200010a20120000b1a00200041f38f08411410402200109c012001200010a20120000b1a00200041879008411610402200109c012001200010a20120000b1a00200041dc8f08411710402200109c012001200010a20120000b0a0041c68f08411610400b1a00200041a68f08410d10402200109c012001200010a20120000b0a0041ca8508410510400b0a0010da01200010a3010b0a0010df01200010a3010b0a0041c68508410410400b0a0010dc01200010a3010bd305020a7f017e230041306b2204240010e201200110c701416b2109024041e0e1082d000022060440416b41ffffffff0720061b21090c010b41e0e10841013a0000416b10280b4101210502402009106b410146044041002106200910072107200441206a210d0340200641106a220c20074b0d02200d42003703002004420037031820092006200441186a22064110106e1a20044100360200200520062004106f210a200620041070210e20062004106f210b200c2106410021050d000b10a202000b4184810841221002000b024002400240024002400240200e500440104f220c200110cb0110ba011039044020022003492208450d0210cd0120024f0d03200320026b2209108b01210510342206200b2005101b200a1038200610334280a30510be0110e301106310e401450d04200110d001220510ad010d05200441186a200510ab01200a20042802181039450d06200441206a2205200528020022072002200220074b1b360200200441106a200441286a2802002207200320032007491b3602002004200428022422072002200220074b1b360224200441086a2005290200370300200420042902183703000c070b41e085084129103c000b41d08908411d103c000b41ad89084114103c000b41b292084112103c000b41f38808410f103c000b200a103821051091012107200420033602102004200236020c2004200236020820042007360204200420053602000c010b41c18908410f103c000b200141012004200410cc012003200220081b21030340200220034704402001200210cf0122051063220820061089012005200810a3012001200210ce0122051063220820061089012005200810a301200241016a21020c010b0b2009108b0121021034220120062002101c200b200b20011066200a103821022004200b3602242004420037031820042002360220200c200441186a104a2000200136020c200042003703002000200a360208200441306a24000b130010ed0110650440419b8c084112103c000b0b0a0041be9108411510400b10002000200110840141ff01714102490b1b002000103b45044041cf8b08411e103c000b10e601200010a7010b0a0041d49008411410400b1e002000280208200110472000290300200110b201200028020c200110450b8a0101047f230041106b220324002001280204220241046a220420012802084b047f41000520012802002003410036020c28020020022003410c6a410410791a200328020c210220012004360204200241187420024180fe03714108747220024108764180fe037120024118767272210241010b21012000200236020420002001360200200341106a24000b2e01027f20011038210220011038220341ed8b08410410101a2000200336020420002001360200200020023602080b2701017f230041106b22022400200220003a000f20012002410f6a4101108201200241106a24000b3a01017f230041106b22032400200341086a200141082002109901200328020c21012000200328020836020020002001360204200341106a24000b0a0010ed01200010a4010b0a0041c48e08411310400b0e00200010830141ff01714101460b1d00024020001094014504402000103b0d010b41fc8d084112103c000b0b130020001029450440418e8e084110103c000b0b1300200041958908410610402200109c0120000b1f00200141a49008410b10402201109c012002200110a2012000200110e9010b0a0041af9008411110400b1f00200141c09008411410402201109c012002200110a2012000200110e9010b1a00200041e89008410e10402200109c012001200010b20120000b1a00200041f69008411010402200109c012001200010b20120000b2100200041869108410410402200109c012001200010b2012002200010a20120000b0a00418a9108410710400b0a00419c9108411010400bf201020a7f017e102a410a105f4100105b4101105b21064102105b2107410341b88508410e10592100410441a98508410f1059210141054193850841161059410641808508411310592102410741ea840841161059410810532103410910532104200010ef01200110ef01200210ef01200310f001200410f00110c101200010a70110c301200110a70110f301200210a70110e50110c0012003109d0110bf012004109d01103a10dd01200610e001200710de0110f901421a10a90142e80710361035108f01108801210010e301200010a3011026210a10d101200a200a4280b4caae067d4280f524827d10a901410110ec010b0800102a4100105f0b7402037f017e230041106b22022400102a10524101105f2002410041d08608410d1059220036020c10ca0110a001210110ca01200141016a2201ad220310a901200110cb012000103e41de8c08410f10b90122002002410c6a10b7012000200110b8012000104c102b2003102c200241106a24000b2d01027f102a10524102105f4100105a2100410141dd8608410910592101200010c701200010cb01200110a7010b2b01027f102a4101105f4100105a2200410010c601418f8d08411110b9012201200010b8012001104c102b0b2b01027f102a4101105f4100105a2200410110c60141b28d08411310b9012201200010b8012001104c102b0b1100102a4101105f4100105a10c90110640b2001017f102a10524101105f4100418d89084108105c210010f901200010a8010b1a01017f102a10524101105f4100105b210010e301200010a3010b9a0201067f230041306b220124004104105f4100105a2100410141a38908410a105c21024102419b89084108105c210341034195890841061059210402400240200010d00110ad01044010f90110a001200320026b4b0d01200120002002200310e10110d301220510ee01450d022000200210d601200510a301200010f1012004103e200010c901410110a401200141186a200141086a2903003703002001200436022820012003360224200120023602202001200129030037031041c58d08411a10b9012205200010b8012002104c1038220010a2012003200010a2012000200410041a200141106a200010e70120052000102b200141306a24000f0b41ed89084121103c000b418e8a084114103c000b41a28a08412c103c000be70101067f230041306b220124004103105f4100105a2104410141a38908410a105c21004102419b89084108105c2103024002400240200410d001220210ad01450440200141046a200210ab0110cd01200128021422024f0d01200020024b0d02200128021020034b0d03200141186a220520042000200310e1012001200336022c2001200036022841df8d08411d10b9012202200410b8012000104c1038220010a2012003200010a2012005200010e70120022000102b200141306a24000f0b41f38a084122103c000b41ce8a084115103c000b41b292084112103c000b41e38a084110103c000b1700102a10524101105f410041ea84084116105910e5010bce0201087f230041306b22002400102a10524102105f4100105a2103410141a38908410a105c2102200310c7012000410c6a200310d001220610ab01024010cd012204200028021c2201490440200120024d200028021820024b720d01200220044d0d012003410120012000410c6a10cc011091012104200028021c21052002210103402007200120054b7245044020042003200110ce0110aa011089012003200110cf01109f01200120054f2107200120012005496a21010c010b0b1051200028020c1038210520002004103336022c2000420037032020002005360228200041206a104a0240200220002802184704402000200236021c20062000410c6a109b010c010b2006109f010b41a08d08411210b9012201200310b8012002104c1038220210a20120042002104520012002102b200041306a24000f0b41b88b084117103c000b41b292084112103c000be60302077f017e230041e0006b22002400102a4101105f4100105a210110e2012000411c6a200110d001220310ab0110cd01200028022c4f04402001410120002000411c6a10cc012003109f01024020002802202205104b0d00200028021c210610e60110ba01109301210141958b08410f10402104104c2102104c21032000200536023c20002006360238200042003703302003200041306a104d200020013602402000427f37033820002002360234200020043602302000109101220536024802400240024002402003106b0e020200010b200041d0006a2003109201027f2000290350500440200041086a200420022000280258200028025c1076200028020c210220002802080c010b1050200041106a200420022001200041d0006a107420002802142102210120002802100b210410910121050c010b10502101200020042002200041406b2003106820002903382107200028020421022000280200210410910121052007427f520d010b102421070b20072001200520042002104e210110254100210420011007210320004100360238200020013602302000200341027622023602340340200220044d0d01200041306a41db8208410b10bd011a20002802342102200028023821040c000b000b200041e0006a24000f0b41a48b084114103c000b1100102a10524101105f4100105b10dd010b1a01017f102a10524101105f4100105b210010d401200010a3010b0d00102a4100105f10d30110160b2d01027f102a10524102105f4100105a21004101105b2101200010c701200010cd0141016a10d601200110a3010b1100102a10524101105f4100105b10e0010b1100102a10524101105f4100105b10de010b8e0202037f017e230041206b22002400102a1061410010602000410036020c2000410c6a2102104c21010340200228020041dce1082802004804402001200241828908410b105510560c010b0b200028020c105e200110072102200041003602142000200241027622023602102000200136020c4100210102400340200120024904402000410c6a41818c08410810bd0121012000420037031820011007220241094f0d022000200041186a200210eb01200141002000280200220120002802042202106e1a20012002107f22034280808080105a0d022003a7220110c701200110d5011a20002802102102200028021421010c010b0b200041206a24000f0b41818c08410841998008410e1054000b1a01017f102a4101105f4100105a220010c701200010d50110160b9214020d7f037e23004190016b22002400102a1061410310604100105a21054101105b2108027f230041206b2201240002400240024041021014450440410321020c010b410210532203100721022001411c6a41003a0000200141186a200236020020012003360214200120023602102001410036020c41032102024002402001410c6a41af8708410a105d41ff01710e020100040b2001410c6a41af8708410a105d220241ff017141034f0d030b2001280210200128020c470d0120012d001c450d0041d4e108410036020041d8e10841003a00000b200141206a240020020c020b41af8708410a41998008410e1054000b41af8708410a41a78008410d1054000b210a20004103360224200041dc006a2102410021030240200041246a2206220128020041dce1082802004e0440410121030c010b2001419987084116105521042001419987084116105710532201100741c000460d0041998708411641f18b0841101054000b2002200136020820022004360204200220033602002000280224105e200028025c2104200028026021032000280264210710e201200510c70110cd0121022006200510d00110ab0102400240024002400240024002400240200028022c20024d0440200220002802344f0d01200041386a2005200210f2012000104f220636024410f8012201200610b00110ac01220d500440200110af0110ac01210d2001200610b001200d42017c220d10a9012001200d10b1012006103e200d500d03200110af01200d10a9010b2000280240200d10b5010d07200041d8006a2005200210f40102402000280260200d10b5010d00200510c9011065450d0420040d05411e104c220110a201200141de9208411e10101a20052001109c012002200110a2012001200610041a200020031007220441187420044180fe03714108747220044108764180fe0371200441187672723602582001200041d8006a410410101a2001200310041a200510f10110ba0120012007102d1a20031007410b4f0d062005200d2005200d10f601220410a001220110f7012003103f2203104720022003109c012003109d012004200141016a10a80120014114490d002005200d2005200d10f501220110a001220310f701109f012001200341016a10a8010b200541012000200041246a10cc01200041386a200d10b401200510d50121072005200210cf0110632109102e210e103d10ae01450d0641989208410a10402201200610041a103d10ba012001416710274167103822011078450440200110072103200041e8006a41003a0000200041e4006a2003360200200020013602602000200336025c20004100360258200041f8006a200041d8006a108001024020002802780d00200028027c10342201102f1a20004200370378200041d8006a200041f8006a41081081010d00200041f8006a22034108107f210f2003200041d8006a10800120002802780d00200028027c10442103200028025c2000280258470d0020002d0068044041d4e108410036020041d8e10841003a00000b0240200e200f510d00200310ee01450d00200310332104200e200f580d00200e200f7d108e01210b1034220c2004200b101c20012001200c10180b20002003360264200020013602602000200e3703580c0a0b20002d0068044041d4e108410036020041d8e10841003a00000b41cb8008412a103c000b200041d8006a200e10bb010c080b41c587084117103c000b41dc8708412e103c000b41d98308410b1002000b41cf85084111103c000b41998808411f103c000b41ea8608410f103c000b200041d8006a200e10bb010c010b418a8808410f103c000b024020002802602201106741ff017141014d044010910121040c010b10342204200110300b027f2007104b04401091010c010b2009200410880120071087010b21032000280224103821010240024002400240027f0240200a41ff0171410346044010df01106321062005200210ce011063200310840141ff017141ff01470d032008104b0d0141ce88084113103c000b2005200210ce0122071063220910ee01450d03200920032003200910840141ff01714101461b22091033200a10d2012203200810e401450d042007106322082008200310662007200810a3012005200210d70122081063220720041089012008200710a3012004200a10d20121042005200210d90122081063220720041089012008200710a30120011038200942901c10be0121042005200210db0122021063220820041089012002200810a3014207210e0240024002400240200a41ff017141016b0e020100020b420e210e0b200020033602544200210d20004200370348200020013602502006103821022003104b0d01102e210d10f30110ba01109301210141b48008410a10402106104c2203200d200e7c1077200320021075104c2202200041c8006a104d200020013602682000427f3703602000200336025c200020063602582000109101220436027002400240024002402002106b0e020200010b200041f8006a2002109201027f2000290378500440200041106a2006200320002802800120002802840110762000280210210620002802140c010b1050200041186a200620032001200041f8006a1074200028021821062101200028021c0b210310910121040c010b10502101200041086a20062003200041e8006a200210682000290360210d200028020c2103200028020821061091012104200d427f520d010b1024210d0b200d2001200420062003104e210110252001100721022000410036028001200020013602782000200241027636027c200041f8006a41db8208410b10bd01220210072101200041e8006a41003a0000200041e4006a2001360200200020023602602000200136025c20004100360258200041d8006a10432201100741044604402000410036028c01200141002000418c016a22024104106e1a41feffffff0720012002410441d0830841041095011b21010b200041d8006a220210c501210d200210422103200028025c2000280258470d0720002d0068044041d4e108410036020041d8e10841003a00000b200141feffffff07470d0141c38308410d1002000b200020033602544200210d20004200370348200020013602502006200041c8006a104a0b200310330c010b2005200210d80122081063220720041089012008200710a301200120062003108801108a0142901c10be0121042005200210db0122011063220320041089012001200310a301200041d8006a22042005200241016a10f4012004200d10b4011091010b41fe8c08411110b9012204200041c4006a10b7012005104c10382202109c01200210450240200a41ff0171220541034704404101200210ea012005410274418c92086a2802002d0000200210ea0120042002102b2001103f22011047200d200110b201200320011045200110410c010b4100200210ea0120042002102b0b20004190016a24000f0b41b888084116103c000b41e188084112103c000b41f38808410f103c000b41db8208410b41998008410e1054000bd20101087f230041206b22002400102a4102105f4100105a2101410141f986084104105c210210f8012104104c2103200041146a2001200210f401200028021810a001210520002802142106410121010340200120054b45044020042006200110a10110ac0110b101220710ae010440200710ba0121020b200320021075200141016a21010c010b0b2000200336021020002003100736021c200041003602182000200041106a3602140340200041086a200041146a10e80120002802080440200028020c10061a0c010b0b200041206a24000b6402047f017e230041106b22002400102a4103105f410041b98708410c105921014101105a2102410241f986084104105c210310f801200110b301220450047e420005200041046a2002200310f201200028020c200410b501ad0b1017200041106a24000b950101057f230041206b22002400102a1061410110604100105a21032000410136020c02402000410c6a2204220128020041dce1082802004e0440410121020c010b200141fd86084110105741fd86084110105821010b20002001360204200020023602002000280204210120002802002102200028020c105e2004200310d00110ab01200320022001200410cc01200041206a24000b6101027f230041206b22002400102a4101105f2000410c6a4100105a10d00110ab01103f2101200028020c2001104720002802102001104520002802142001109c0120002802182001109c01200028021c2001109c0120011041200041206a24000b1b00102a4102105f4100105a410141f986084104105c10cf0110620b1b00102a4102105f4100105a410141f986084104105c10ce0110620b960202077f017e230041206b22002400102a4102105f4100105a2102410141e68608410410592101200210c701104c21050240024010f801200110b3012207500d002002200710f50110a00121062002200710f60110a00121010340200120064d0d012000410c6a220320022007200141016b220110f70110482003107a2003107b21032000280210200028020c470d0220002d001c044041d4e108410036020041d8e10841003a00000b104c1038220410472003200410a2012005200410560c000b000b20002005360208200020051007360214200041003602102000200041086a36020c034020002000410c6a10e80120002802000440200028020410061a0c010b0b200041206a24000f0b41998008410e107d000b4701037f102a4102105f4100105a2100410141808408410a10592101104f200010c801200010f1012001103e41ed8c08411110b9012202200010b801104c1a200220011038102b0b0e00102a4100105f10cd01ad102c0b5002017f017e102a4101105f410041f986084104105c2200450440418d8708410c103c000b10d10110ac012000ad4280f5247e7c22014280f5247d103f220010b201200142017d200010b201200010410b1000102a4100105f10d10110ac01102c0b1600102a10524101105f410041c18008410a1059103a0b1000102a4100105f103d10ba0110061a0b0f00102a10524100105f410110ec010b0f00102a10524100105f410010ec010b0d00102a4100105f10ed0110640b0300010b0b0041b09308410e1002000b0bba130300418080080ba303726563697069656e742061646472657373206e6f7420736574696e70757420746f6f206c6f6e67696e76616c69642076616c75656c6f636b546f6b656e7300010273635f616464726573734661696c6564206465636f64696e6720726573756c742066726f6d20656e6572677920666163746f7279496e76616c69642061646472657373696e636f7272656374206e756d626572206f662045534454207472616e7366657273617267756d656e74206465636f6465206572726f722028293a20746f6f2066657720617267756d656e7473746f6f206d616e7920617267756d656e747377726f6e67206e756d626572206f6620617267756d656e747363616e6e6f74207375627472616374206265636175736520726573756c7420776f756c64206265206e656761746976654d756c7469455344544e46545472616e73666572455344544e46545472616e73666572455344545472616e7366657273796e6320726573756c74696e70757420746f6f2073686f72746361737420746f20693634206572726f724d616e6167656456656320696e646578206f7574206f662072616e67650041c383080bfb0f4553445420657870656374656445474c442e6974656d4944204f766572666c6f772e696e64657873746f72616765206465636f6465206572726f723a206e65775f7369676e657270726f6a6563745f6964496e76616c6964205745474c442d55534443207061697220616464726573732066726f6d20726f75746572496e76616c696420544f4b454e2d55534443207061697220616464726573732066726f6d20726f75746572666565735f636f6c6c6563746f725f6164647265737373696d706c655f6c6f636b5f61646472657373656e657267795f666163746f72795f61646472657373736166655f70726963655f70616972726f757465725f6164647265737362657461616c70686150726f6a656374206973207061757365644f6e6c792070726f6a656374206f776e6572206d61792063616c6c207468697320656e64706f696e74496e76616c69642070726f6a6563742049444f6e6c79207363206f776e6572206f722070726f6a656374206f776e6572206d61792063616c6c207468697320656e64706f696e7470726f6a6563745f6f776e65726e65775f6f776e6572757365724c656e67746820746f6f206c6f6e677765656b6f70745f6d61785f6e725f7765656b73496e76616c6964207765656b6f70745f6e6f74655f616e645f7369676e6174757265636c61696d5f74797065757365725f6164647265737350726f6a656374206e6f742073746172746564207965744d6179206e6f7420636c61696d207265776172647320666f7220746869732070726f6a65637420616e796d6f7265416c726561647920636c61696d65644d7573742070726f76696465206e6f746520616e64207369676e617475726543616e20636c61696d2066756c6c2072657761726473496e76616c6964206d696e20726577617264734e6f7420656e6f7567682072657761726473546f6f20666577207265776172647370726f6a6563745f6964736e725f7765656b737369676e6572656e645f7765656b73746172745f7765656b496e76616c6964207765656b206e756d62657273496e76616c6964207061796d656e744f6e6c792066756e6769626c6520746f6b656e73206163636570746564496e697469616c207265776172647320616c7265616479206465706f7369746564546f6f2066657720726577617264207765656b734669727374207765656b207265776172647320646f6c6c61722070657220656e65726779206e6f742073657450726f6a65637420616c726561647920656e646564496e76616c696420656e64207765656b4d757374206465706f73697420696e697469616c20726577617264732066697273746465706f7369745377617046656573456e64207765656b206e6f74207265616368656443616e6e6f7420776974686472617720616e796d6f7265496e76616c6964206665657320636f6c6c6563746f7220616464726573732e6c656e626164206172726179206c656e6774687661722061726773696e707574206f7574206f662072616e6765436f6e747261637420697320706175736564676574536166655072696365427954696d657374616d704f6666736574656e65726779466163746f72794164647265737361646450726f6a6563744576656e746368616e67655369676e65724576656e74636c61696d526577617264734576656e74706175736550726f6a6563744576656e746f776e657257697468647261774576656e74756e706175736550726f6a6563744576656e746465706f736974496e697469616c526577617264734576656e746465706f7369744164646974696f6e616c526577617264734576656e74496e76616c69642053432061646472657373496e76616c696420746f6b656e20494470726f6a6563744f776e657270726f6a6563744163746976656c61737450726f6a656374496470617573655f6d6f64756c653a70617573656475736463546f6b656e4964726f75746572416464726573737765676c64546f6b656e49647361666550726963655061697266697273745765656b417072746f74616c456e65726779466f725765656b726567526577446f6c6c617273726577446f6c6c617273506572456e657267796d696e526577446f6c6c617273506572456e65726779696e74456e65726779466f72526577436c61696d657273726567456e65726779526577436c61696d657273726567456e657267794578656d70436c61696d6572736765745061697275736572436c61696d656473696d706c654c6f636b416464726573736578656d707465645061727469636970616e747366656573436f6c6c6563746f724164647265737366697273744e6f7465496e64657863757272656e744e6f7465496e6465786e6f74657573657249647372657761726473496e666f6d696e52657761726473506572696f6472657761726473546f74616c416d6f756e746d696e5765656b6c795265776172647356616c75657265776172647352656d61696e696e67416d6f756e7466697273745765656b537461727454696d657374616d70a861000050c30000a08601003e0002003f0002004000020075736572456e65726779626173654173736574546f6b656e4964496e76616c6964207374617274207765656b5765656b2030206973206e6f7420612076616c6964207765656b7845786368616e676547726f77746856315461736b436f6d706c65746564456e64706f696e742063616e206f6e6c792062652063616c6c6564206279206f776e6572616464724964616464726c617374496470616e6963206f636375727265640041c093080b049cffffff", + "size": 21505, + "code": "0061736d0100000001a8011b60000060017f017f60027f7f0060027f7f017f6000017f60017f0060037f7f7f0060037f7f7f017f60047f7f7f7f0060027f7e0060047f7f7f7f017f60057f7f7f7f7f0060027f7e017f6000017e60017f017e60017e0060017e017f60057e7f7f7f7f017f60027f7f017e60057f7f7e7f7f017f60067e7f7f7f7f7f017f60047f7f7f7e0060047f7e7f7f0060027e7f0060037f7f7e017f60047f7f7f7e017f60037f7e7f017f02bb093303656e760e626967496e74536574496e743634000903656e7609626967496e74416464000603656e760b7369676e616c4572726f72000203656e760a6d4275666665724e6577000403656e760d6d427566666572417070656e64000303656e76096d4275666665724571000303656e760d6d42756666657246696e697368000103656e76106d4275666665724765744c656e677468000103656e76226d616e616765644d756c74695472616e73666572455344544e465445786563757465001303656e761b6d616e61676564457865637574654f6e44657374436f6e74657874001403656e760d6d616e6167656443616c6c6572000503656e76136d616e616765644f776e657241646472657373000503656e760f6d4275666665724765744279746573000303656e760f6973536d617274436f6e7472616374000103656e76126d427566666572476574417267756d656e74000303656e76126d427566666572417070656e644279746573000703656e76126d616e616765645369676e616c4572726f72000503656e761b736d616c6c496e74476574556e7369676e6564417267756d656e74000e03656e7619626967496e74476574556e7369676e6564417267756d656e74000203656e7611676574417267756d656e744c656e677468000103656e760f6765744e756d417267756d656e7473000403656e7614626967496e7446696e697368556e7369676e6564000503656e7614736d616c6c496e7446696e6973685369676e6564000f03656e7609626967496e74537562000603656e7609626967496e74436d70000303656e760f6d4275666665725365744279746573000703656e760a626967496e7454446976000603656e7609626967496e744d756c000603656e76196d42756666657246726f6d426967496e74556e7369676e6564000303656e76176d427566666572546f426967496e74556e7369676e6564000303656e7609626967496e74506f77000603656e760a626967496e7453717274000203656e76146d427566666572436f707942797465536c696365000a03656e76126d42756666657253746f726167654c6f6164000303656e76136d42756666657253746f7261676553746f7265000303656e760f636c65616e52657475726e44617461000003656e7611676574426c6f636b54696d657374616d70000d03656e761d6d42756666657253746f726167654c6f616446726f6d41646472657373000603656e761c6d616e616765644765744d756c74694553445443616c6c56616c7565000503656e761776616c6964617465546f6b656e4964656e746966696572000103656e760a6765744761734c656674000d03656e76106d616e61676564534341646472657373000503656e760e636865636b4e6f5061796d656e74000003656e760f6d616e6167656457726974654c6f67000203656e7616736d616c6c496e7446696e697368556e7369676e6564000f03656e76146d616e6167656456657269667945643235353139000703656e760d676574426c6f636b45706f6368000d03656e76156d427566666572546f426967496e745369676e6564000303656e7609626967496e74416273000203656e760a626967496e745369676e000103656e76136d42756666657247657442797465536c696365000a03f301f1010104041009010305010204020403050101010201020201020104021104040001080702070707010701070505050005010501060106080b060201090b0a0312150b0808080b0201110b0801010202070601030a02030303020101030c100101040201010a08080a00020202020501030202160602020902010e02010101030c1712090c0c0202030109070d071804040419040b0e020502010401080403030104030404010303030304030405050405080004030504020202020504010505010604060c0c1a040404000000000000000000000000000000000000000000000000000000000000000000000000000000000005030100030616037f01418080080b7f004181e2080b7f004190e2080b07e8062b066d656d6f7279020004696e697400fb01077570677261646500fc010a61646450726f6a65637400fd010f73657450726f6a6563744f776e657200fe010c706175736550726f6a65637400ff010e756e706175736550726f6a6563740080020f697350726f6a656374416374697665008102137365744d696e52657761726473506572696f64008202187365744d696e5765656b6c795265776172647356616c7565008302156465706f736974496e697469616c52657761726473008402186465706f7369744164646974696f6e616c526577617264730085021773657446656573436f6c6c6563746f7241646472657373008602146f776e65725769746864726177526577617264730087020d66696e69736850726f6772616d0088021c7365744d696e526577617264446f6c6c617273506572456e657267790089020f73657446697273745765656b417072008a020e676574496e697469616c52647065008b02217365744e6578745765656b526577617264446f6c6c617273506572456e65726779008c0208736574416c706861008d020773657442657461008e021c736574546f74616c456e65726779466f7243757272656e745765656b008f021c676574546f74616c456e65726779466f7243757272656e745765656b0090020c636c61696d52657761726473009102176765744578656d707465645061727469636970616e74730092020e67657455736572436c61696d65640093020d757064617465526577617264730094020e67657452657761726473496e666f0095021567657452657761726473546f74616c416d6f756e74009602196765745265776172647352656d61696e696e67416d6f756e740097020f6765744e6f746573486973746f72790098020c6368616e67655369676e65720099020e67657443757272656e745765656b009a021e67657454696d657374616d70735374617274416e64456e644f665765656b009b021a67657446697273745765656b537461727454696d657374616d70009c0217736574456e65726779466163746f727941646472657373009d0217676574456e65726779466163746f727941646472657373009e02057061757365009f0207756e706175736500a00208697350617573656400a1020863616c6c4261636b00a2020a5f5f646174615f656e6403010b5f5f686561705f6261736503020ad18001f1011601017f1034220142001000200120012000100120010b1901017f41c0930841c0930828020041016b220036020020000b0e01017f10342200420a100020000b0e01017f103422012000103720010b19002001420053044041f5820841111002000b2000200110000b0f01017f10032201200010041a20010b0b0020002001100541004a0b19002000103b45044041f58008410f103c000b103d2000103e0b1400200041e1e108100c1a41e1e108100d41004a0b0900200020011002000b0a0041ca8c08411410400b090020002001109d010b0a0041989208410010400b1101017f103422022000200110191a20020b0700200010061a0b08002000104310440b8d0101047f230041106b220124002001410036020c20002001410c6a410441db8208410b107b2001200028020820002802002203200128020c220241187420024180fe03714108747220024108764180fe0371200241187672722202107c2001280200410147044041db8208410b41e68208410f1053000b20012802042000200220036a360200200141106a24000b0d00200010342200101d1a20000b0a0020001046200110470b0f01017f103422012000101c1a20010b5101027f230041106b22022400200220001007220341187420034180fe03714108747220034108764180fe03712003411876727236020c20012002410c6a410410820120012000108601200241106a24000b3701017f20011049220210072101200041106a41003a00002000410c6a20013602002000200236020820002001360204200041003602000b0d0020001034220010211a20000b6902057f017e230041106b22022400200128020c2204104b45044020012903002107104c2105104c2106104c210320012802081038210120022004103336020c200220073703002002200136020820032002104d2000200342002005200610081a0b200241106a24000b0c00200010830141ff0171450b1301017f1034220041989208410010191a20000bd20102027f017e230041106b2203240020032001280208220241187420024180fe03714108747220024108764180fe0371200241187672723602002003200128020c220241187420024180fe03714108747220024108764180fe03712002411876727236020c20032001290300220442388620044280fe0383422886842004428080fc0783421886200442808080f80f834208868484200442088842808080f80f832004421888428080fc07838420044228884280fe03832004423888848484370204200020034110100f1a200341106a24000b1500200020012002200320041034220110091a20010b0c01017f10342200100a20000b0c01017f10342200100b20000b15001050104f103904400f0b41fc920841241002000b0d00200010342200100e1a20000b2e01017f41a6810841171040220420002001100f1a200441bd81084103100f1a200420022003100f1a20041010000b0c00200020012002105610520b4601017f230041106b220224002002200141187420014180fe03714108747220014108764180fe03712001411876727236020c20002002410c6a4104100f1a200241106a24000b2f01017f2000280200220341dce1082802004e04402001200241c0810841111053000b2000200341016a36020020030b2501017e20001011220342ffffffff0f5804402003a70f0b2001200241998008410e1053000b1f00200010522200100741204704402001200241f18b0841101053000b20000b2601017e2000101122014280808080105a0440418a8408410a41998008410e1053000b2001a70b0a0020002001200210570b0c00200010342200101220000b2f01017f230041106b22032400200341003a000f20002003410f6a410120012002107b20032d000f200341106a24000b1900200041dce1082802004e04400f0b41d1810841121002000b1400101420004604400f0b41e3810841191002000b1900200041dce1082802004c04400f0b41c0810841111002000b0b0041dce10810143602000b08002000106210150b08002000104910440b090020001064ad10160b2f01017e027f0240200010ab012201420158044041002001a741016b0d021a0c010b41898c084112107f000b41010b0b1f0020002001200210172000106641ff017104400f0b41fc810841301002000b1500410241012000103122001b4100200041004e1b0b4b01017f230041106b22032400200341086a200128020020012802042002106820012003290308370200200041086a200141086a28020036020020002001290200370200200341106a24000b1b00104c1a200220031038105520002002360204200020013602000b940202087f017e230041406a22052400200541206a41ac82084114106a20052802202107200528022422062003106b2004106c2103104c22082003ad106d20062008105520041007210a200541306a210b410021030340200a200341106a2208490440200541086a2007200620012002106e200528020c21012000200528020836020020002001360204200541406b240005200b42003703002005420037032820042003200541286a22034110106f1a2005410036023c20032005413c6a22091070210c200320091071210d2003200910702103200541186a20072006200c1068200541106a2005280218200528021c200d10722005280210210720052802142106104c1a2006200310461055200821030c010b0b0b180020012002104021012000104c360204200020013602000b1000104c1a20002001280200103810550b0900200010074104760b3801017f230041106b2202240020024200370308200220014100200241086a10a40120002002280200200228020410191a200241106a24000b900101037f230041106b220524000240200310790d00200220031078200410072106410021030340200341046a220720064b0d012005410036020c200420032005410c6a4104106f1a2002200528020c220341187420034180fe03714108747220034108764180fe0371200341187672721078200721030c000b000b2000200236020420002001360200200541106a24000b0d0020002001200220031085010b7301017f230041106b220224002002410036020c2002200020012802002200200041046a22001097012002410c6a41042002280200200228020410980120012000360200200228020c2100200241106a2400200041187420004180fe03714108747220004108764180fe0371200041187672720ba70102017e017f230041106b22032400200342003703082003200020012802002200200041086a2200109701200341086a4108200328020020032802041098012001200036020020032903082102200341106a2400200242388620024280fe0383422886842002428080fc0783421886200242808080f80f834208868484200242088842808080f80f832002421888428080fc07838420024228884280fe038320024238888484840b2001017f104c22042003106d20022004105520002002360204200020013602000ba00101017f230041306b22052400200541286a41c08208410f106a200541206a2005280228200528022c20042802081074200541186a2005280220200528022420042903001072200541106a2005280218200528021c200428020c1075200541086a200528021020052802142003107620052005280208200528020c20012002106e200528020421012000200528020036020020002001360204200541306a24000b1e00104c1a200220032802001038105520002002360204200020013602000b1e00104c1a200220032802001046105520002002360204200020013602000b160020022003107820002002360204200020013602000b7101017f230041206b22052400200541186a41cf8208410c106a200541106a2005280218200528021c20031074200541086a200528021020052802142004107520052005280208200528020c20012002106e200528020421012000200528020036020020002001360204200541206a24000b0d00104c1a20002001103810550b070020001007450b0e0020002001200220032004104e0b1c002000200120022003200410c5012000200028020020026a3602000b1f0020012002200310032201102021022000200136020420002002453602000b5201047f230041106b220124002000107e2102200141086a2000280208200028020022032002107c2001280208410147044041e68208410f107f000b200128020c2000200220036a360200200141106a24000b7001017f230041106b220124002001410036020c200041086a20002802002001410c6a4104109901044041e68208410f107f000b2000200028020041046a360200200128020c2100200141106a2400200041187420004180fe03714108747220004108764180fe0371200041187672720b1a01017f41ea830841161040220220002001100f1a20021010000bae0101037f230041106b220224002002410036020c024020012002410c6a410410810122034504402002200128020820012802002204200228020c220341187420034180fe03714108747220034108764180fe0371200341187672722203107c2000027f20022802004101460440200020022802043602042001200320046a36020041000c010b2000410f36020441e682080b3602000c010b2000410f360204200020033602000b200241106a24000b3201017f41e682082103200041086a200028020020012002109901047f41e68208052000200028020020026a36020041000b0b0b00200020012002100f1a0b09002000106641016b0b1500417f200020011018220041004720004100481b0b0f00200020012003200210324100470b09002000200110041a0b0c00200020002001100120000b0c00200020002001101a20000b0c00200020002001101b20000b0a0020002000200110010b11002000200041a08d06108c01101a20000b0b0041722000ad100041720b0f00200020002001108c01101b20000b0f00200020002001108f01101b20000b0a0041722000103741720b1301017f1034220120004106108c01101e20010b0e01017f103422012000101f20010b0e01017f103422004200100020000b810102047f017e230041206b22022400200241106a42003703002002420037030820014100200241086a22034110106f2002410036021c20032002411c6a2204107021052003200410712106200241086a2002411c6a10702103044041868308411d1002000b2000200336020c2000200536020820002006370300200241206a24000b1900200041feffffff074604404180800841191002000b20000b6001027f230041206b22012400200010074120460440200141186a4200370300200141106a4200370300200141086a42003703002001420037030020004100200141201085011a2001412041a38308412010960121020b200141206a240020020b5301027f2001200346047f4100210302402001450d00034020002d0000220420022d00002205460440200041016a2100200241016a2102200141016b22010d010c020b0b200420056b21030b20030541010b450b31000240200220034d0440200341104b0d012000200320026b3602042000200120026a3602000f0b109a01000b109a01000bb60201067f200120034604402001220341104f04402000410020006b41037122046a210520040440200221010340200020012d00003a0000200141016a2101200041016a22002005490d000b0b2005200320046b2203417c7122066a21000240200220046a22044103710440200641004c0d012004410374220141187121072004417c71220841046a2102410020016b4118712109200828020021010340200520012007762002280200220120097472360200200241046a2102200541046a22052000490d000b0c010b200641004c0d0020042102034020052002280200360200200241046a2102200541046a22052000490d000b0b20034103712103200420066a21020b20030440200020036a21010340200020022d00003a0000200241016a2102200041016a22002001490d000b0b0f0b109a01000bab0101027f02400240027f024020002d000845044020002802002204100722054190ce004b0d0141d8e1082d00000d0141d4e108200536020041d8e10841013a00002004410041c493082005106f1a200041013a00080b4101200120036a220041d4e1082802004b0d011a20002001490d0220004190ce004b0d0320022003200141c493086a200310980141000f0b200041003a00082004200120022003106f0b0f0b109a01000b109a01000b060010a302000b3f01017f103f210220012802002002104720012802042002104520012802082002109c01200128020c2002109c0120012802102002109c0120002002109d010b4601017f230041106b220224002002200041187420004180fe03714108747220004108764180fe03712000411876727236020c20012002410c6a4104108201200241106a24000b09002000200110221a0b0b0020002001104610221a0b1400416c41989208410010191a2000416c10221a0b2101017e200010ab0122014280808080105a044041998008410e107f000b2001a70b1a0020001038220041d483084105100f1a2001200010a20120000b090020002001109c010b3901017f230041106b220224002002420037030820022001ad4101200241086a10a40120002002280200200228020410a501200241106a24000b9e0202047f027e2003200142388620014280fe0383422886842001428080fc0783421886200142808080f80f834208868484200142088842808080f80f832001421888428080fc07838420014238882208200142288822094280fe0383848484370000200041084100200142005322072002716b41ff017122042008a746220520042001423088a741ff01714671220620056a20042009a741ff01714620067122056a20042001422088a741ff01714620057122056a200520042001a72205411876467122066a2004200541107641ff01714620067122066a2004200541087641ff01714620067122046a2004200150716a22042007200320044107716a2c0000410048732004410047712002716b22026b3602042000200220036a3602000b0d00200020012002104010221a0b090020002001109e010b0a0020002001ad10a8010b3801017f230041106b2202240020024200370308200220014100200241086a10a40120002002280200200228020410a501200241106a24000b080020002001103e0b0d01017f200010622000109f010ba20102017e027f230041106b22022400200242003703082000104922031007220041094f044041998008410e107f000b20034100200220006b41106a20001085011a20022903082101200241106a2400200142388620014280fe0383422886842001428080fc0783421886200142808080f80f834208868484200142088842808080f80f832001421888428080fc07838420014228884280fe038320014238888484840ba00101057f230041206b220224002002410c6a2203200110482003107d21012002410c6a107d104421042003107e21032002410c6a107e21052002410c6a107e21062002280210200228020c4604402002411c6a2d0000044041d4e108410036020041d8e10841003a00000b200020063602102000200536020c200020033602082000200436020420002001360200200241206a24000f0b41998008410e107f000b0800200010ae01450b0d002000416710211a416710070b130020001038220041aa93084106100f1a20000b1a0020001038220041a693084104100f1a2000200110860120000b1a0020001038220041a093084106100f1a2001200010b20120000b7801017f230041106b220224002002200042388620004280fe0383422886842000428080fc0783421886200042808080f80f834208868484200042088842808080f80f832000421888428080fc07838420004228884280fe038320004238888484843703082001200241086a4108108201200241106a24000b0c002000200110b00110ab010b5001037f20002802082203200110b5014504402000280204220210a00121042000280200200441016a220010a101200110a80120022000ad10a801200210a00121002003200110b6012000ad10a8010b0b0f002000200110b60110a0014100470b1a0020001038220041e483084106100f1a2001200010b20120000b1301017f104c22022001ad106d2000200210550b080020002001106b0b1201017f104c2202200020011040105520020b1b002000104922001007412047044041f18b084110107f000b20000b2201017f1034220242001000200010920136020c20002001370300200020023602080bbe0102027f017e230041306b22032400200010940121002003419d90084107106a2003200036022c20032003290300370224200341186a2200200341246a2204200110672003410c6a20002002106710bd0120032802102100200328020c2101200328021410920120012000104e210010232000100721012003410036022c2003200036022420032001410276360228200441db8208410b10be01103822001007412047044041db8208410b41f18b0841101053000b200341306a240020000b1701017e1028220042a08d067d2000200042a08d06561b0b7b01027f230041106b22032400200028020821042003410036020c200028020020044102742003410c6a4104106f450440200328020c21012000200441016a360208200141187420014180fe03714108747220014108764180fe0371200141187672721038200341106a24000f0b2001200241c0810841111053000b8f0101057f20001038210310c0011049210410c1011049210510c20110ba0122061038200310382004103810bc01220710950145044020062004200510bc012203109501044041948408412b103c000b200310c0011049200720002001200210c301200210c3010f0b20062003200510bc012203109501450440200320002001200210c3010f0b41bf8408412b103c000b0a0041ef8e08410c10400b0a0041d78e08410b10400b0a0041e28e08410d10400bf40201037f230041406a2204240010c40110ba011094012106200441106a41ad8c08411d106a200441086a200428021020042802142000107620042004280208200428020c2003107220042802002100200428020421052001104c1038220110474200200110b20120022001104520052001105510bd01200610920120002005104e21011023200110072100200441003602242004200136021c200420004102763602202004411c6a41db8208410b10be01220010072101200441386a41003a0000200441346a2001360200200420003602302004200136022c200441003602282004410036023c200441286a2004413c6a410441db8208410b10c501024020042d003f044020042d003c450d010b200441286a41db8208410b105c1a0b200441286a220010431a200010c6011a200010422100200428022c200428022846044020042d0038044041d4e108410036020041d8e10841003a00000b200441406b240020000f0b41db8208410b41998008410e1053000b0a0041fb8e08410d10400b2300200041086a20002802002001200210990104402003200441e68208410f1053000b0b880102017e017f230041106b22022400200242003703082000200241086a410841db8208410b107b20022903082101200241106a2400200142388620014280fe0383422886842001428080fc0783421886200142808080f80f834208868484200142088842808080f80f832001421888428080fc07838420014228884280fe038320014238888484840b1800200010c801104f200010c901200010ca01200110a3010b170010cb0110a0012000490440418986084112103c000b0b2a01017f1050210202402000200110cc0110ba0110390d002000200210390d00419b86084135103c000b0b1300200041aa8e08410d10402200109c0120000b0a0041b78e08410d10400b13002000419e8e08410c10402200109c0120000bd90101047f024010ce0122052003280208490d00200328020c220420054f0d00200420032802102206460d002005200220046a2202200520022005491b20011b2205200620052006491b22012004200120044b1b210710920121020340200420074604400240200520064f044020032802042002108a010c010b2000200110cf012204106222052002108a012004200510a6012000200110d0012204106222052002108a012004200510a6010b2003200136020c0520022000200410cf0110aa01108a01200441016a21040c010b0b0b200010d1012003109b010b2b01027e1024220010d20110ab01220154044041c49208411a103c000b200020017d4280f52480a741016a0b1a00200041d39108411610402200109c012001200010a20120000b1a00200041ac9108411210402200109c012001200010a20120000b1300200041919108410b10402200109c0120000b0a0041e99108411710400b1b002000200141ff0171410274418092086a280200108d01108b010b840101027f4280c8afa025103642808090bbbad6adf00d108e01210141a29208411010402100103d10ba0120004167102541671038200110334280a30510bf01210010d5011062200010890142808090bbbad6adf00d108e0142808090bbbad6adf00d108e01103510900141a08d06108d014134108d0142a00b108e0120011089011088010b0a0041888f08410c10400bbc0301097f230041306b2204240010ce012101200041948f08411210402205109c012001200510a2010240200510ad014504402005106221000c010b200441086a200010d10110ac012000200110d00110622101200428020820014280a30510bf0121090240200010ce01220310d701220710ad014504402007106221010c010b2000200341016b220210d80110622000200210d901106210870121082000200210da01106221062000200210d80110622201104b45044020062000200210d9011062200610890120011088011087011a0b10db01106221012008104b0d002006104b0d002004411c6a200010d10110ac012000200310d00110622103200428021c20034280a30510bf0121032000200210dc01106220031089011091012100200820061089011091012102200710dd01106242808090bbbad6adf00d108e0142808090bbbad6adf00d108e012000108901200241a08d06108d011088011035109001108801220020012000200110840141ff01714101461b2201109e010b2001103510900110890121002005200942808090bbbad6adf00d108e0142808090bbbad6adf00d108e0120001088012200109e010b200441306a240020000b1a00200041b38f08411310402200109c012001200010a20120000b1a00200041f38f08411410402200109c012001200010a20120000b1a00200041879008411610402200109c012001200010a20120000b1a00200041dc8f08411710402200109c012001200010a20120000b0a0041c68f08411610400b1a00200041a68f08410d10402200109c012001200010a20120000b0a0041ca8508410510400b0a0010db01200010a6010b0a0010e001200010a6010b0a0041c68508410410400b0a0010dd01200010a6010bd405020a7f017e230041306b2204240010e301200110c801416b2109024041e0e1082d000022060440416b41ffffffff0720061b21090c010b41e0e10841013a0000416b10260b4101210502402009106c410146044041002106200910072107200441206a210d0340200641106a220c20074b0d02200d42003703002004420037031820092006200441186a220641101085011a200441003602002005200620041070210a200620041071210e200620041070210b200c2106410021050d000b10a302000b4184810841221002000b024002400240024002400240200e500440104f220c200110cc0110ba011039044020022003492208450d0210ce0120024f0d03200320026b2209108c01210510342206200b2005101a200a1038200610334280a30510bf0110e401106210e501450d04200110d101220510ad010d05200441186a200510ac01200a20042802181039450d06200441206a2205200528020022072002200220074b1b360200200441106a200441286a2802002207200320032007491b3602002004200428022422072002200220074b1b360224200441086a2005290200370300200420042902183703000c070b41e085084129103c000b41d08908411d103c000b41ad89084114103c000b41b292084112103c000b41f38808410f103c000b200a103821051092012107200420033602102004200236020c2004200236020820042007360204200420053602000c010b41c18908410f103c000b200141012004200410cd012003200220081b21030340200220034704402001200210d0012205106222082006108a012005200810a6012001200210cf012205106222082006108a012005200810a601200241016a21020c010b0b2009108c0121021034220120062002101b200b200b20011065200a103821022004200b3602242004420037031820042002360220200c200441186a104a2000200136020c200042003703002000200a360208200441306a24000b130010ed0110640440419b8c084112103c000b0b0a0041be9108411510400b10002000200110840141ff01714102490b1b002000103b45044041cf8b08411e103c000b10e701200010a9010b0a0041d49008411410400b1e002000280208200110472000290300200110b201200028020c200110450b8a0101047f230041106b220324002001280204220241046a220420012802084b047f41000520012802002003410036020c28020020022003410c6a4104106f1a200328020c210220012004360204200241187420024180fe03714108747220024108764180fe037120024118767272210241010b21012000200236020420002001360200200341106a24000b2e01027f20011038210220011038220341ed8b084104100f1a2000200336020420002001360200200020023602080b2701017f230041106b22022400200220003a000f20012002410f6a4101108201200241106a24000b0a0010ed01200010a3010b0a0041c48e08411310400b0e00200010830141ff01714101460b1d00024020001095014504402000103b0d010b41fc8d084112103c000b0b130020001027450440418e8e084110103c000b0b1300200041958908410610402200109c0120000b1f00200141a49008410b10402201109c012002200110a2012000200110ea010b0a0041af9008411110400b1f00200141c09008411410402201109c012002200110a2012000200110ea010b1a00200041e89008410e10402200109c012001200010b20120000b1a00200041f69008411010402200109c012001200010b20120000b2100200041869108410410402200109c012001200010b2012002200010a20120000b0a00418a9108410710400b0a00419c9108411010400b0c01017f10342200102920000bf201020a7f017e102a410a105e4100105b4101105b21064102105b2107410341b88508410e10582100410441a98508410f1058210141054193850841161058410641808508411310582102410741ea840841161058410810522103410910522104200010ef01200110ef01200210ef01200310f001200410f00110c201200010a90110c401200110a90110f301200210a90110e60110c1012003109d0110c0012004109d01103a10de01200610e101200710df0110f901421a10a80142e80710361035109001108901210010e401200010a6011024210a10d201200a200a4280b4caae067d4280f524827d10a801410110ec010b0800102a4100105e0b7402037f017e230041106b22022400102a10514101105e2002410041d08608410d1058220036020c10cb0110a001210110cb01200141016a2201ad220310a801200110cc012000103e41de8c08410f10b90122002002410c6a10b8012000200110b7012000104c102b2003102c200241106a24000b2d01027f102a10514102105e410010592100410141dd8608410910582101200010c801200010cc01200110a9010b2b01027f102a4101105e410010592200410010c701418f8d08411110b9012201200010b7012001104c102b0b2b01027f102a4101105e410010592200410110c70141b28d08411310b9012201200010b7012001104c102b0b1100102a4101105e4100105910ca0110630b2001017f102a10514101105e4100418d89084108105a210010f901200010a7010b1a01017f102a10514101105e4100105b210010e401200010a6010b9a0201067f230041306b220124004104105e410010592100410141a38908410a105a21024102419b89084108105a210341034195890841061058210402400240200010d10110ad01044010f90110a001200320026b4b0d01200120002002200310e20110d401220510ee01450d022000200210d701200510a601200010f1012004103e200010ca01410110a301200141186a200141086a2903003703002001200436022820012003360224200120023602202001200129030037031041c58d08411a10b9012205200010b7012002104c1038220010a2012003200010a2012000200410041a200141106a200010e80120052000102b200141306a24000f0b41ed89084121103c000b418e8a084114103c000b41a28a08412c103c000be70101067f230041306b220124004103105e410010592104410141a38908410a105a21004102419b89084108105a2103024002400240200410d101220210ad01450440200141046a200210ac0110ce01200128021422024f0d01200020024b0d02200128021020034b0d03200141186a220520042000200310e2012001200336022c2001200036022841df8d08411d10b9012202200410b7012000104c1038220010a2012003200010a2012005200010e80120022000102b200141306a24000f0b41f38a084122103c000b41ce8a084115103c000b41b292084112103c000b41e38a084110103c000b1700102a10514101105e410041ea84084116105810e6010bd10201087f230041306b22012400102a10514102105e410010592103410141a38908410a105a2102200310c8012001410c6a2206200310d101220710ac01024010ce012204200128021c2200490440200020024d200128021820024b720d01200220044d0d01200341012000200610cd01410021061092012104200128021c21052002210003402006200020054b7245044020042003200010cf0110aa01108a012003200010d001109f01200020054f2106200020002005496a21000c010b0b1050200128020c1038210520012004103336022c2001420037032020012005360228200141206a104a0240200220012802184704402001200236021c20072001410c6a109b010c010b2007109f010b41a08d08411210b9012200200310b7012002104c1038220210a20120042002104520002002102b200141306a24000f0b41b88b084117103c000b41b292084112103c000be80402077f017e23004190016b22002400102a4101105e41001059210110e301200041246a2203200110d101220210ac0110ce0120002802344f0440200141012000200310cd012002109f01024020002802282206104b0d002000280224210510e70110ba011094012104200041186a41958b08410f106a20002802182101200028021c2102104c21032000200636027420002005360270200042003703682003200041e8006a104d20002003360244200020043602402000200236023c20002001360238200010bd01220737034820002004360254027f0240024002402003106c0e020102000b200020012002200041d4006a200310692000280204210120002802002102200710fa0110920120022001107a0c020b2007200410920120012002107a0c010b200041d8006a200310930120002903582107200041fc006a200041e4006a2203360200200041f8006a200041e0006a2206360200200020073703702000200041c8006a22053602880120002005360284012000200236026c2000200136026820002005360280012007500440200041086a20012002200620031077200028020c210120002802082102109201210320002903482004200320022001107a0c010b200041106a200120022004200041f0006a1073200028021421012000280210210210fa012104109201210320002903482004200320022001107a0b2101102341002102200110072104200041003602702000200136026820002004410276220136026c0340200120024d0d01200041e8006a41db8208410b10be011a200028026c2101200028027021020c000b000b20004190016a24000f0b41a48b084114103c000b1100102a10514101105e4100105b10de010b1a01017f102a10514101105e4100105b210010d501200010a6010b0d00102a4100105e10d40110150b2d01027f102a10514102105e4100105921004101105b2101200010c801200010ce0141016a10d701200110a6010b1100102a10514101105e4100105b10e1010b1100102a10514101105e4100105b10df010bd10202037f017e230041206b22002400102a10604100105f2000410036020c2000410c6a2102104c21010340200228020041dce1082802004804402001200241828908410b105410550c010b0b200028020c105d200110072102200041003602142000200241027622023602102000200136020c4100210102400340200120024904402000410c6a41818c08410810be0121012000420037031820011007220241094f0d0220014100200020026b41206a20021085011a2000290318220342388620034280fe0383422886842003428080fc0783421886200342808080f80f834208868484200342088842808080f80f832003421888428080fc07838420034228884280fe0383200342388884848422034280808080105a0d022003a7220110c801200110d6011a20002802102102200028021421010c010b0b200041206a24000f0b41818c08410841998008410e1053000b1a01017f102a4101105e41001059220010c801200010d60110150b8416020d7f037e230041c0016b22002400102a10604103105f4100105921044101105b2107027f230041206b2202240002400240024041021013450440410321010c010b410210522203100721012002411c6a41003a0000200241186a200136020020022003360214200220013602102002410036020c41032101024002402002410c6a41af8708410a105c41ff01710e020100040b2002410c6a41af8708410a105c220141ff017141034f0d030b2002280210200228020c470d0120022d001c450d0041d4e108410036020041d8e10841003a00000b200241206a240020010c020b41af8708410a41998008410e1053000b41af8708410a41a78008410d1053000b210a200041033602342000419c016a2101410021030240200041346a2206220228020041dce1082802004e0440410121030c010b2002419987084116105421052002419987084116105610522202100741c000460d0041998708411641f18b0841101053000b2001200236020820012005360204200120033602002000280234105d200028029c01210820002802a001210320002802a401210910e301200410c80110ce0121022006200410d10110ac0102400240024002400240024002400240200028023c20024d0440200220002802444f0d01200041c8006a2004200210f2012000104f220536025410f8012201200510b00110ab01220d500440200110af0110ab01210d2001200510b001200d42017c220d10a8012001200d10b1012005103e200d500d03200110af01200d10a8010b2000280250200d10b5010d0720004198016a220b2004200210f401024020002802a001200d10b5010d00200410ca011064450d0420080d05411e104c220110a201200141de9208411e100f1a20042001109c012002200110a2012001200510041a200020031007220641187420064180fe03714108747220064108764180fe037120064118767272360298012001200b4104100f1a2001200310041a200410f10110ba0120012009102d1a20031007410b4f0d062004200d2004200d10f601220610a001220110f7012003103f2203104720022003109c012003109d012006200141016a10a70120014114490d002004200d2004200d10f501220110a001220310f701109f012001200341016a10a7010b200441012000200041346a10cd01200041c8006a200d10b401200410d60121082004200210d00110622109102e210f103d10ae01450d0641989208410a10402201200510041a103d10ba012001416710254167103822011079450440200110072103200041a8016a41003a0000200041a4016a2003360200200020013602a0012000200336029c01200041003602980120004188016a220320004198016a220610800102402000280288010d00200028028c0110342201102f1a20004200370388012006200341081081010d00200029038801210e200320061080012000280288010d00200028028c0110442103200028029c01200028029801470d0020002d00a801044041d4e108410036020041d8e10841003a00000b0240200e423886200e4280fe038342288684200e428080fc0783421886200e42808080f80f834208868484200e42088842808080f80f83200e421888428080fc078384200e4228884280fe0383200e423888848484220e200f510d00200310ee01450d00200310332106200e200f5a0d00200f200e7d108f01210b1034220c2006200b101b20012001200c10170b200020033602a401200020013602a0012000200f370398010c0a0b20002d00a801044041d4e108410036020041d8e10841003a00000b41cb8008412a103c000b20004198016a200f10bb010c080b41c587084117103c000b41dc8708412e103c000b41d98308410b1002000b41cf85084111103c000b41998808411f103c000b41ea8608410f103c000b20004198016a200f10bb010c010b418a8808410f103c000b024020002802a0012201106641ff017141014d044010920121060c010b10342206200110300b027f2008104b04401092010c010b2009200610890120081088010b21032000280234103821010240024002400240027f0240200a41ff0171410346044010e001106221052004200210cf011062200310840141ff017141ff01470d032007104b0d0141ce88084113103c000b2004200210cf0122081062220910ee01450d03200920032003200910840141ff01714101461b22091033200a10d3012203200710e501450d042008106222072007200310652008200710a6012004200210d8012207106222082006108a012007200810a6012006200a10d30121062004200210da012207106222082006108a012007200810a60120011038200942901c10bf0121062004200210dc012202106222072006108a012002200710a6014207210e0240024002400240200a41ff017141016b0e020100020b420e210e0b200020033602644200210d20004200370358200020013602602005103821052003104b0d01102e210d10f30110ba011094012103200041286a41b48008410a106a200041206a2000280228200028022c200d200e7c1072200028022021022000280224220120051078104c2205200041d8006a104d20002005360274200020033602702000200136026c20002002360268200010bd01220d3703782000200336028401027f0240024002402005106c0e020102000b200041086a2002200120004184016a20051069200028020c210220002802082101200d10fa0110920120012002107a0c020b200d200310920120022001107a0c010b20004188016a2005109301200029038801210d200041ac016a20004194016a2206360200200041a8016a20004190016a22073602002000200d3703a0012000200041f8006a22053602b801200020053602b4012000200136029c012000200236029801200020053602b001200d500440200041106a200220012007200610772000280214210220002802102101109201210520002903782003200520012002107a0c010b200041186a200220012003200041a0016a1073200028021c21022000280218210110fa012103109201210520002903782003200520012002107a0b21021023200210072101200041003602900120002002360288012000200141027636028c0120004188016a41db8208410b10be01220110072102200041a8016a41003a0000200041a4016a2002360200200020013602a0012000200236029c01200041003602980120004198016a10432201100741044604402000410036027820014100200041f8006a220241041085011a41feffffff0720012002410441d0830841041096011b21010b20004198016a220210c601210d200210422103200028029c01200028029801470d0720002d00a801044041d4e108410036020041d8e10841003a00000b200141feffffff07470d0141c38308410d1002000b200020033602644200210d20004200370358200020013602602005200041d8006a104a0b200310330c010b2004200210d9012207106222082006108a012007200810a601200120052003108901108b0142901c10bf0121052004200210dc012201106222032005108a012001200310a60120004198016a22052004200241016a10f4012005200d10b4011092010b41fe8c08411110b9012202200041d4006a10b8012004104c10382204109c01200410450240200a41ff0171220541034704404101200410eb012005410274418c92086a2802002d0000200410eb0120022004102b2001103f22041047200d200410b201200320041045200410410c010b4100200410eb0120022004102b0b200041c0016a24000f0b41b888084116103c000b41e188084112103c000b41f38808410f103c000b41db8208410b41998008410e1053000bd20101087f230041206b22002400102a4102105e410010592101410141f986084104105a210210f8012104104c2103200041146a2001200210f401200028021810a001210520002802142106410121010340200120054b45044020042006200110a10110ab0110b101220710ae010440200710ba0121020b200320021078200141016a21010c010b0b2000200336021020002003100736021c200041003602182000200041106a3602140340200041086a200041146a10e90120002802080440200028020c10061a0c010b0b200041206a24000b6402047f017e230041106b22002400102a4103105e410041b98708410c10582101410110592102410241f986084104105a210310f801200110b301220450047e420005200041046a2002200310f201200028020c200410b501ad0b1016200041106a24000b950101057f230041206b22002400102a10604101105f4100105921032000410136020c02402000410c6a2204220128020041dce1082802004e0440410121020c010b200141fd86084110105641fd86084110105721010b20002001360204200020023602002000280204210120002802002102200028020c105d2004200310d10110ac01200320022001200410cd01200041206a24000b6101027f230041206b22002400102a4101105e2000410c6a4100105910d10110ac01103f2101200028020c2001104720002802102001104520002802142001109c0120002802182001109c01200028021c2001109c0120011041200041206a24000b1b00102a4102105e41001059410141f986084104105a10d00110610b1b00102a4102105e41001059410141f986084104105a10cf0110610b960202077f017e230041206b22002400102a4102105e410010592102410141e68608410410582101200210c801104c21050240024010f801200110b3012207500d002002200710f50110a00121062002200710f60110a00121010340200120064d0d012000410c6a220320022007200141016b220110f70110482003107d2003107e21032000280210200028020c470d0220002d001c044041d4e108410036020041d8e10841003a00000b104c1038220410472003200410a2012005200410550c000b000b20002005360208200020051007360214200041003602102000200041086a36020c034020002000410c6a10e90120002802000440200028020410061a0c010b0b200041206a24000f0b41998008410e107f000b4701037f102a4102105e410010592100410141808408410a10582101104f200010c901200010f1012001103e41ed8c08411110b9012202200010b701104c1a200220011038102b0b0e00102a4100105e10ce01ad102c0b5002017f017e102a4101105e410041f986084104105a2200450440418d8708410c103c000b10d20110ab012000ad4280f5247e7c22014280f5247d103f220010b201200142017d200010b201200010410b1000102a4100105e10d20110ab01102c0b1600102a10514101105e410041c18008410a1058103a0b1000102a4100105e103d10ba0110061a0b0f00102a10514100105e410110ec010b0f00102a10514100105e410010ec010b0d00102a4100105e10ed0110630b02000b0b0041b09308410e1002000b0bba130300418080080ba303726563697069656e742061646472657373206e6f7420736574696e70757420746f6f206c6f6e67696e76616c69642076616c75656c6f636b546f6b656e7300010273635f616464726573734661696c6564206465636f64696e6720726573756c742066726f6d20656e6572677920666163746f7279496e76616c69642061646472657373696e636f7272656374206e756d626572206f662045534454207472616e7366657273617267756d656e74206465636f6465206572726f722028293a20746f6f2066657720617267756d656e7473746f6f206d616e7920617267756d656e747377726f6e67206e756d626572206f6620617267756d656e747363616e6e6f74207375627472616374206265636175736520726573756c7420776f756c64206265206e656761746976654d756c7469455344544e46545472616e73666572455344544e46545472616e73666572455344545472616e7366657273796e6320726573756c74696e70757420746f6f2073686f72746361737420746f20693634206572726f724d616e6167656456656320696e646578206f7574206f662072616e67650041c383080bfb0f4553445420657870656374656445474c442e6974656d4944204f766572666c6f772e696e64657873746f72616765206465636f6465206572726f723a206e65775f7369676e657270726f6a6563745f6964496e76616c6964205745474c442d55534443207061697220616464726573732066726f6d20726f75746572496e76616c696420544f4b454e2d55534443207061697220616464726573732066726f6d20726f75746572666565735f636f6c6c6563746f725f6164647265737373696d706c655f6c6f636b5f61646472657373656e657267795f666163746f72795f61646472657373736166655f70726963655f70616972726f757465725f6164647265737362657461616c70686150726f6a656374206973207061757365644f6e6c792070726f6a656374206f776e6572206d61792063616c6c207468697320656e64706f696e74496e76616c69642070726f6a6563742049444f6e6c79207363206f776e6572206f722070726f6a656374206f776e6572206d61792063616c6c207468697320656e64706f696e7470726f6a6563745f6f776e65726e65775f6f776e6572757365724c656e67746820746f6f206c6f6e677765656b6f70745f6d61785f6e725f7765656b73496e76616c6964207765656b6f70745f6e6f74655f616e645f7369676e6174757265636c61696d5f74797065757365725f6164647265737350726f6a656374206e6f742073746172746564207965744d6179206e6f7420636c61696d207265776172647320666f7220746869732070726f6a65637420616e796d6f7265416c726561647920636c61696d65644d7573742070726f76696465206e6f746520616e64207369676e617475726543616e20636c61696d2066756c6c2072657761726473496e76616c6964206d696e20726577617264734e6f7420656e6f7567682072657761726473546f6f20666577207265776172647370726f6a6563745f6964736e725f7765656b737369676e6572656e645f7765656b73746172745f7765656b496e76616c6964207765656b206e756d62657273496e76616c6964207061796d656e744f6e6c792066756e6769626c6520746f6b656e73206163636570746564496e697469616c207265776172647320616c7265616479206465706f7369746564546f6f2066657720726577617264207765656b734669727374207765656b207265776172647320646f6c6c61722070657220656e65726779206e6f742073657450726f6a65637420616c726561647920656e646564496e76616c696420656e64207765656b4d757374206465706f73697420696e697469616c20726577617264732066697273746465706f7369745377617046656573456e64207765656b206e6f74207265616368656443616e6e6f7420776974686472617720616e796d6f7265496e76616c6964206665657320636f6c6c6563746f7220616464726573732e6c656e626164206172726179206c656e6774687661722061726773696e707574206f7574206f662072616e6765436f6e747261637420697320706175736564676574536166655072696365427954696d657374616d704f6666736574656e65726779466163746f72794164647265737361646450726f6a6563744576656e746368616e67655369676e65724576656e74636c61696d526577617264734576656e74706175736550726f6a6563744576656e746f776e657257697468647261774576656e74756e706175736550726f6a6563744576656e746465706f736974496e697469616c526577617264734576656e746465706f7369744164646974696f6e616c526577617264734576656e74496e76616c69642053432061646472657373496e76616c696420746f6b656e20494470726f6a6563744f776e657270726f6a6563744163746976656c61737450726f6a656374496470617573655f6d6f64756c653a70617573656475736463546f6b656e4964726f75746572416464726573737765676c64546f6b656e49647361666550726963655061697266697273745765656b417072746f74616c456e65726779466f725765656b726567526577446f6c6c617273726577446f6c6c617273506572456e657267796d696e526577446f6c6c617273506572456e65726779696e74456e65726779466f72526577436c61696d657273726567456e65726779526577436c61696d657273726567456e657267794578656d70436c61696d6572736765745061697275736572436c61696d656473696d706c654c6f636b416464726573736578656d707465645061727469636970616e747366656573436f6c6c6563746f724164647265737366697273744e6f7465496e64657863757272656e744e6f7465496e6465786e6f74657573657249647372657761726473496e666f6d696e52657761726473506572696f6472657761726473546f74616c416d6f756e746d696e5765656b6c795265776172647356616c75657265776172647352656d61696e696e67416d6f756e7466697273745765656b537461727454696d657374616d70a861000050c30000a08601003e0002003f0002004000020075736572456e65726779626173654173736574546f6b656e4964496e76616c6964207374617274207765656b5765656b2030206973206e6f7420612076616c6964207765656b7845786368616e676547726f77746856315461736b436f6d706c65746564456e64706f696e742063616e206f6e6c792062652063616c6c6564206279206f776e6572616464724964616464726c617374496470616e6963206f636375727265640041c093080b049cffffff", "report": { "imports": [ "bigIntAbs", diff --git a/growth-program/output/growth-program.wasm b/growth-program/output/growth-program.wasm index af938fb8fa10e5348e1bc33082c484abc00611e6..a6f83be018eb8ee8335f884c1e486f2f315f4e22 100755 GIT binary patch delta 10610 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 delta 10102 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 N!V&c7smq=#`Uj?tRb>DG diff --git a/growth-program/src/lib.rs b/growth-program/src/lib.rs index fc85f95..9c06ea2 100644 --- a/growth-program/src/lib.rs +++ b/growth-program/src/lib.rs @@ -100,6 +100,6 @@ pub trait GrowthProgram: self.set_paused(true); } - #[endpoint] + #[upgrade] fn upgrade(&self) {} } diff --git a/growth-program/wasm/Cargo.lock b/growth-program/wasm/Cargo.lock index d94ec74..9ee91e4 100644 --- a/growth-program/wasm/Cargo.lock +++ b/growth-program/wasm/Cargo.lock @@ -10,20 +10,20 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "common-types" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "common_errors" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -39,7 +39,7 @@ dependencies = [ [[package]] name = "common_structs" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "fixed-supply-token", "math", @@ -50,9 +50,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "endian-type" @@ -63,7 +63,7 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "energy-factory" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_structs", "legacy_token_decode_module", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "energy-query" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "energy-factory", "multiversx-sc", @@ -89,7 +89,7 @@ dependencies = [ [[package]] name = "fees-collector" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common-types", "common_errors", @@ -108,7 +108,7 @@ dependencies = [ [[package]] name = "fixed-supply-token" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -159,7 +159,7 @@ dependencies = [ [[package]] name = "legacy_token_decode_module" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_structs", "multiversx-sc", @@ -169,17 +169,15 @@ dependencies = [ [[package]] name = "locking_module" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ - "energy-factory", "multiversx-sc", - "simple-lock", ] [[package]] name = "math" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -187,39 +185,41 @@ dependencies = [ [[package]] name = "mergeable" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1291e3712731f4e34775254e9a9b8ff70132d15414f2e51f9bc82c23faf48c" +checksum = "0c9624cfb01497bf386d6b8837fa8e6785d45c8d4e122ba9c31060ecf5fce413" dependencies = [ "bitflags", "hex-literal", "multiversx-sc-codec", "multiversx-sc-derive", "num-traits", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1da6db65170105c9495848c5e4ba388abb1f9201ff2ca362056c9328f36b7760" +checksum = "35c94397b2fba14e40edfa55905b3f453ed57aa06c9b1960ad6a0ca6bfb7a236" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631c4d4b37fc94659c8d6cf559c21b68c68899095201de2e1b779fccad7b0b03" +checksum = "cf72a8042da0bc19da0b8f0d4f61b4c66ae853560fefc69cd8fea87bf1aa8c14" dependencies = [ "hex", "proc-macro2", @@ -229,9 +229,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f0331893be2b757401b2deaf7d8b8c90745fa69114000d83fe26d8487d35a5" +checksum = "754cdc20001c3b51df75784c5d8ce454697d0e86264f1d88da392ea211f662f9" dependencies = [ "hex", "proc-macro2", @@ -242,18 +242,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e507a180afcab409cc3d920bc12f3852cf481a6657428879d1a70f6c2666c94" +checksum = "25824610adec5b01c7b38cd469983940b33a7d11b2c0011af7ad572fe10ac1ae" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bd18dbc72c83aa2e9ad3f4a00dcc27c03ada66c13f9056001dc9157055d616" +checksum = "42a7f031a91eb7360be47ad19c06ed1246486eb789ef8091df0646de85071f7d" dependencies = [ "multiversx-sc", ] @@ -269,9 +269,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -279,7 +279,7 @@ dependencies = [ [[package]] name = "pair" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_errors", "common_structs", @@ -296,7 +296,7 @@ dependencies = [ [[package]] name = "pausable" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", "permissions_module", @@ -305,7 +305,7 @@ dependencies = [ [[package]] name = "permissions_module" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "bitflags", "common_errors", @@ -314,18 +314,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -343,12 +343,14 @@ dependencies = [ [[package]] name = "router" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ + "common_structs", "locking_module", "multiversx-sc", "pair", "pausable", + "permissions_module", "simple-lock", "token_send", ] @@ -356,7 +358,7 @@ dependencies = [ [[package]] name = "sc_whitelist_module" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_errors", "multiversx-sc", @@ -365,7 +367,7 @@ dependencies = [ [[package]] name = "simple-lock" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_structs", "multiversx-sc", @@ -374,15 +376,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.48" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -392,7 +394,7 @@ dependencies = [ [[package]] name = "token_send" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_errors", "common_structs", @@ -405,10 +407,16 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unwrap-infallible" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb" + [[package]] name = "unwrappable" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -416,7 +424,7 @@ dependencies = [ [[package]] name = "utils" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_structs", "fixed-supply-token", @@ -427,7 +435,7 @@ dependencies = [ [[package]] name = "week-timekeeping" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common-types", "multiversx-sc", @@ -436,7 +444,7 @@ dependencies = [ [[package]] name = "weekly-rewards-splitting" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common-types", "energy-query", diff --git a/growth-program/wasm/Cargo.toml b/growth-program/wasm/Cargo.toml index f11387a..c6b0c60 100644 --- a/growth-program/wasm/Cargo.toml +++ b/growth-program/wasm/Cargo.toml @@ -21,11 +21,14 @@ debug = false panic = "abort" overflow-checks = false +[profile.dev] +panic = "abort" + [dependencies.growth-program] path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.48.0" +version = "=0.50.0" [workspace] members = ["."] diff --git a/growth-program/wasm/src/lib.rs b/growth-program/wasm/src/lib.rs index 6f8b119..04653d8 100644 --- a/growth-program/wasm/src/lib.rs +++ b/growth-program/wasm/src/lib.rs @@ -5,13 +5,12 @@ //////////////////////////////////////////////////// // Init: 1 -// Endpoints: 38 +// Upgrade: 1 +// Endpoints: 37 // Async Callback (empty): 1 // Total number of exported functions: 40 #![no_std] -#![allow(internal_features)] -#![feature(lang_items)] multiversx_sc_wasm_adapter::allocator!(); multiversx_sc_wasm_adapter::panic_handler!(); diff --git a/metabonding/Cargo.toml b/metabonding/Cargo.toml index 32276c8..94884b5 100644 --- a/metabonding/Cargo.toml +++ b/metabonding/Cargo.toml @@ -9,14 +9,14 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "=0.48.0" +version = "=0.50.0" [dependencies.multiversx-sc-modules] -version = "=0.48.0" +version = "=0.50.0" [dependencies.sc_whitelist_module] git = "https://github.com/multiversx/mx-exchange-sc" -rev = "27085fb" +rev = "2c5a2d9" [dev-dependencies] num-bigint = "0.4.2" @@ -25,4 +25,4 @@ hex = "0.4" hex-literal = "0.4.1" [dev-dependencies.multiversx-sc-scenario] -version = "=0.48.0" +version = "=0.50.0" diff --git a/metabonding/meta/Cargo.toml b/metabonding/meta/Cargo.toml index 1ee693a..9f0a891 100644 --- a/metabonding/meta/Cargo.toml +++ b/metabonding/meta/Cargo.toml @@ -11,5 +11,5 @@ authors = ["Dorin Marian Iancu, dorin.iancu@multiversx.com"] path = ".." [dependencies.multiversx-sc-meta] -version = "=0.48.0" +version = "=0.50.0" default-features = false diff --git a/metabonding/wasm/Cargo.lock b/metabonding/wasm/Cargo.lock index 7119547..3dfd858 100644 --- a/metabonding/wasm/Cargo.lock +++ b/metabonding/wasm/Cargo.lock @@ -10,20 +10,20 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "common_errors" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "multiversx-sc", ] @@ -65,32 +65,34 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1291e3712731f4e34775254e9a9b8ff70132d15414f2e51f9bc82c23faf48c" +checksum = "0c9624cfb01497bf386d6b8837fa8e6785d45c8d4e122ba9c31060ecf5fce413" dependencies = [ "bitflags", "hex-literal", "multiversx-sc-codec", "multiversx-sc-derive", "num-traits", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1da6db65170105c9495848c5e4ba388abb1f9201ff2ca362056c9328f36b7760" +checksum = "35c94397b2fba14e40edfa55905b3f453ed57aa06c9b1960ad6a0ca6bfb7a236" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631c4d4b37fc94659c8d6cf559c21b68c68899095201de2e1b779fccad7b0b03" +checksum = "cf72a8042da0bc19da0b8f0d4f61b4c66ae853560fefc69cd8fea87bf1aa8c14" dependencies = [ "hex", "proc-macro2", @@ -100,9 +102,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f0331893be2b757401b2deaf7d8b8c90745fa69114000d83fe26d8487d35a5" +checksum = "754cdc20001c3b51df75784c5d8ce454697d0e86264f1d88da392ea211f662f9" dependencies = [ "hex", "proc-macro2", @@ -113,18 +115,18 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e507a180afcab409cc3d920bc12f3852cf481a6657428879d1a70f6c2666c94" +checksum = "25824610adec5b01c7b38cd469983940b33a7d11b2c0011af7ad572fe10ac1ae" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bd18dbc72c83aa2e9ad3f4a00dcc27c03ada66c13f9056001dc9157055d616" +checksum = "42a7f031a91eb7360be47ad19c06ed1246486eb789ef8091df0646de85071f7d" dependencies = [ "multiversx-sc", ] @@ -140,27 +142,27 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -178,7 +180,7 @@ dependencies = [ [[package]] name = "sc_whitelist_module" version = "0.0.0" -source = "git+https://github.com/multiversx/mx-exchange-sc?rev=27085fb#27085fb87fec527938d45c063962a0bc44b2d42c" +source = "git+https://github.com/multiversx/mx-exchange-sc?rev=2c5a2d9#2c5a2d9c34243eec42242dbc09034bcb2dae8937" dependencies = [ "common_errors", "multiversx-sc", @@ -186,15 +188,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.48" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -206,3 +208,9 @@ name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unwrap-infallible" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb" diff --git a/metabonding/wasm/Cargo.toml b/metabonding/wasm/Cargo.toml index d881c27..a4fbcb1 100644 --- a/metabonding/wasm/Cargo.toml +++ b/metabonding/wasm/Cargo.toml @@ -21,11 +21,14 @@ debug = false panic = "abort" overflow-checks = false +[profile.dev] +panic = "abort" + [dependencies.metabonding] path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.48.0" +version = "=0.50.0" [workspace] members = ["."] diff --git a/metabonding/wasm/src/lib.rs b/metabonding/wasm/src/lib.rs index e97133a..31e8817 100644 --- a/metabonding/wasm/src/lib.rs +++ b/metabonding/wasm/src/lib.rs @@ -10,8 +10,6 @@ // Total number of exported functions: 22 #![no_std] -#![allow(internal_features)] -#![feature(lang_items)] multiversx_sc_wasm_adapter::allocator!(); multiversx_sc_wasm_adapter::panic_handler!(); diff --git a/pair-mock/Cargo.toml b/pair-mock/Cargo.toml index 1b4e6d2..abfeedf 100644 --- a/pair-mock/Cargo.toml +++ b/pair-mock/Cargo.toml @@ -9,8 +9,8 @@ publish = false path = "src/pair.rs" [dependencies.multiversx-sc] -version = "=0.48.0" +version = "=0.50.0" features = ["esdt-token-payment-legacy-decode"] [dev-dependencies.multiversx-sc-scenario] -version = "=0.48.0" +version = "=0.50.0" diff --git a/pair-mock/meta/Cargo.toml b/pair-mock/meta/Cargo.toml index 48c38e5..1e60af3 100644 --- a/pair-mock/meta/Cargo.toml +++ b/pair-mock/meta/Cargo.toml @@ -11,5 +11,5 @@ authors = ["MultiversX "] path = ".." [dependencies.multiversx-sc-meta] -version = "=0.48.0" +version = "=0.50.0" default-features = false diff --git a/pair-mock/wasm/Cargo.lock b/pair-mock/wasm/Cargo.lock index a479928..76cd111 100644 --- a/pair-mock/wasm/Cargo.lock +++ b/pair-mock/wasm/Cargo.lock @@ -10,15 +10,15 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "endian-type" @@ -40,32 +40,34 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1291e3712731f4e34775254e9a9b8ff70132d15414f2e51f9bc82c23faf48c" +checksum = "0c9624cfb01497bf386d6b8837fa8e6785d45c8d4e122ba9c31060ecf5fce413" dependencies = [ "bitflags", "hex-literal", "multiversx-sc-codec", "multiversx-sc-derive", "num-traits", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1da6db65170105c9495848c5e4ba388abb1f9201ff2ca362056c9328f36b7760" +checksum = "35c94397b2fba14e40edfa55905b3f453ed57aa06c9b1960ad6a0ca6bfb7a236" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631c4d4b37fc94659c8d6cf559c21b68c68899095201de2e1b779fccad7b0b03" +checksum = "cf72a8042da0bc19da0b8f0d4f61b4c66ae853560fefc69cd8fea87bf1aa8c14" dependencies = [ "hex", "proc-macro2", @@ -75,9 +77,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f0331893be2b757401b2deaf7d8b8c90745fa69114000d83fe26d8487d35a5" +checksum = "754cdc20001c3b51df75784c5d8ce454697d0e86264f1d88da392ea211f662f9" dependencies = [ "hex", "proc-macro2", @@ -88,9 +90,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bd18dbc72c83aa2e9ad3f4a00dcc27c03ada66c13f9056001dc9157055d616" +checksum = "42a7f031a91eb7360be47ad19c06ed1246486eb789ef8091df0646de85071f7d" dependencies = [ "multiversx-sc", ] @@ -106,9 +108,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -130,18 +132,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -158,15 +160,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.48" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -178,3 +180,9 @@ name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unwrap-infallible" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb" diff --git a/pair-mock/wasm/Cargo.toml b/pair-mock/wasm/Cargo.toml index 2bbacc7..3c7592b 100644 --- a/pair-mock/wasm/Cargo.toml +++ b/pair-mock/wasm/Cargo.toml @@ -21,11 +21,14 @@ debug = false panic = "abort" overflow-checks = false +[profile.dev] +panic = "abort" + [dependencies.pair-mock] path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.48.0" +version = "=0.50.0" [workspace] members = ["."] diff --git a/pair-mock/wasm/src/lib.rs b/pair-mock/wasm/src/lib.rs index 16afa30..e87dd4d 100644 --- a/pair-mock/wasm/src/lib.rs +++ b/pair-mock/wasm/src/lib.rs @@ -10,8 +10,6 @@ // Total number of exported functions: 3 #![no_std] -#![allow(internal_features)] -#![feature(lang_items)] multiversx_sc_wasm_adapter::allocator!(); multiversx_sc_wasm_adapter::panic_handler!(); diff --git a/router-mock/Cargo.toml b/router-mock/Cargo.toml index fb44475..a4aa1ec 100644 --- a/router-mock/Cargo.toml +++ b/router-mock/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/router_mock.rs" [dependencies.multiversx-sc] -version = "=0.48.0" +version = "=0.50.0" [dev-dependencies] num-bigint = "0.4.2" [dev-dependencies.multiversx-sc-scenario] -version = "=0.48.0" +version = "=0.50.0" diff --git a/router-mock/meta/Cargo.toml b/router-mock/meta/Cargo.toml index 4d8695b..ae8428e 100644 --- a/router-mock/meta/Cargo.toml +++ b/router-mock/meta/Cargo.toml @@ -8,5 +8,5 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "=0.48.0" +version = "=0.50.0" default-features = false diff --git a/router-mock/output/router-mock.abi.json b/router-mock/output/router-mock.abi.json index 0e84b23..a31700f 100644 --- a/router-mock/output/router-mock.abi.json +++ b/router-mock/output/router-mock.abi.json @@ -10,11 +10,11 @@ "contractCrate": { "name": "router-mock", "version": "0.0.0", - "gitVersion": "v1.0.2-174-g56a7b35" + "gitVersion": "v1.0.2-176-gf36b29a" }, "framework": { "name": "multiversx-sc", - "version": "0.48.0" + "version": "0.50.0" } }, "name": "RouterMock", diff --git a/router-mock/output/router-mock.mxsc.json b/router-mock/output/router-mock.mxsc.json index 9233b7a..470adca 100644 --- a/router-mock/output/router-mock.mxsc.json +++ b/router-mock/output/router-mock.mxsc.json @@ -13,7 +13,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.48.0" + "version": "0.50.0" } }, "abi": { @@ -56,8 +56,8 @@ "hasCallback": false, "types": {} }, - "size": 894, - "code": "0061736d0100000001230760027f7f017f60000060017f017f6000017f60037f7f7f017f60017f0060027f7f00028d020c03656e76096d4275666665724571000003656e76126d427566666572417070656e644279746573000403656e76126d616e616765645369676e616c4572726f72000503656e76106d4275666665724765744c656e677468000203656e760f6765744e756d417267756d656e7473000303656e760b7369676e616c4572726f72000603656e760f6d4275666665725365744279746573000403656e76126d42756666657253746f726167654c6f6164000003656e76126d427566666572476574417267756d656e74000003656e760e636865636b4e6f5061796d656e74000103656e76136d42756666657253746f7261676553746f7265000003656e760d6d42756666657246696e6973680002030c0b00000201030203030101010503010003060f027f00419c81080b7f0041a081080b074106066d656d6f7279020004696e69740014076765745061697200150863616c6c4261636b00160a5f5f646174615f656e6403000b5f5f686561705f6261736503010ac2020b0b0020002001100041004a0b1101017f101022022000200110061a20020b0d0020001010220010081a20000b1400100441024604400f0b41a3800841191005000b1901017f419881084198810828020041016b220036020020000b0d0020001010220010071a20000b0a0041828108410b100d0b0a00418d8108410b100d0b5801027f1009100f4100100e220010034120470440418980084117100d220041808008410910011a200041a08008410310011a200041f28008411010011a20001002000b4101100e210110122000100a1a10132001100a1a0b6401027f1009100f4100100e21004101100e2101024002402000101310112200100c0d0020012000100c0d0041bc80084120100d21000c010b10121011220010034120460d0041dc80084116100d220041f28008411010011a20001002000b2000100b1a0b0300010b0b92010300418080080b3c706169725f61646472617267756d656e74206465636f6465206572726f722028293a2077726f6e67206e756d626572206f6620617267756d656e74730041dc80080b3c73746f72616765206465636f6465206572726f723a20626164206172726179206c656e677468706169724164647265737375736463546f6b656e496400419881080b049cffffff", + "size": 893, + "code": "0061736d0100000001230760027f7f017f60000060017f017f6000017f60037f7f7f017f60017f0060027f7f00028d020c03656e76096d4275666665724571000003656e76126d427566666572417070656e644279746573000403656e76126d616e616765645369676e616c4572726f72000503656e76106d4275666665724765744c656e677468000203656e760f6765744e756d417267756d656e7473000303656e760b7369676e616c4572726f72000603656e760f6d4275666665725365744279746573000403656e76126d427566666572476574417267756d656e74000003656e76126d42756666657253746f726167654c6f6164000003656e760e636865636b4e6f5061796d656e74000103656e76136d42756666657253746f7261676553746f7265000003656e760d6d42756666657246696e6973680002030c0b00000201030203030101010503010003060f027f00419c81080b7f0041a081080b074106066d656d6f7279020004696e69740014076765745061697200150863616c6c4261636b00160a5f5f646174615f656e6403000b5f5f686561705f6261736503010ac1020b0b0020002001100041004a0b1101017f101022022000200110061a20020b0d0020001010220010071a20000b1400100441024604400f0b41a3800841191005000b1901017f419881084198810828020041016b220036020020000b0d0020001010220010081a20000b0a0041828108410b100d0b0a00418d8108410b100d0b5801027f1009100f4100100e220010034120470440418980084117100d220041808008410910011a200041a08008410310011a200041f28008411010011a20001002000b4101100e210110122000100a1a10132001100a1a0b6401027f1009100f4100100e21004101100e2101024002402000101310112200100c0d0020012000100c0d0041bc80084120100d21000c010b10121011220010034120460d0041dc80084116100d220041f28008411010011a20001002000b2000100b1a0b02000b0b92010300418080080b3c706169725f61646472617267756d656e74206465636f6465206572726f722028293a2077726f6e67206e756d626572206f6620617267756d656e74730041dc80080b3c73746f72616765206465636f6465206572726f723a20626164206172726179206c656e677468706169724164647265737375736463546f6b656e496400419881080b049cffffff", "report": { "imports": [ "checkNoPayment", diff --git a/router-mock/output/router-mock.wasm b/router-mock/output/router-mock.wasm index bf7a2ae9af380ac99513b5d6e33fa8569b8b5018..d7491fcc4e0a8431630b7455e19acbc52c2182a0 100755 GIT binary patch delta 40 ycmV+@0N4Ni2K@$*)RFBGk<1y9{-*)KlcoVF0SA-N0XzW+lMMpc0s;V&=mM5|xDXBi delta 41 zcmV+^0M`Hg2L1++)RFBGk<1y9{-*)LlcoVF0SJ@O0XzW*lMMpc0|Nj7ljj1KiQy0t diff --git a/router-mock/wasm/Cargo.lock b/router-mock/wasm/Cargo.lock index 6734035..b2df453 100644 --- a/router-mock/wasm/Cargo.lock +++ b/router-mock/wasm/Cargo.lock @@ -10,15 +10,15 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "endian-type" @@ -40,32 +40,34 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1291e3712731f4e34775254e9a9b8ff70132d15414f2e51f9bc82c23faf48c" +checksum = "0c9624cfb01497bf386d6b8837fa8e6785d45c8d4e122ba9c31060ecf5fce413" dependencies = [ "bitflags", "hex-literal", "multiversx-sc-codec", "multiversx-sc-derive", "num-traits", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1da6db65170105c9495848c5e4ba388abb1f9201ff2ca362056c9328f36b7760" +checksum = "35c94397b2fba14e40edfa55905b3f453ed57aa06c9b1960ad6a0ca6bfb7a236" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", + "unwrap-infallible", ] [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.6" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631c4d4b37fc94659c8d6cf559c21b68c68899095201de2e1b779fccad7b0b03" +checksum = "cf72a8042da0bc19da0b8f0d4f61b4c66ae853560fefc69cd8fea87bf1aa8c14" dependencies = [ "hex", "proc-macro2", @@ -75,9 +77,9 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95f0331893be2b757401b2deaf7d8b8c90745fa69114000d83fe26d8487d35a5" +checksum = "754cdc20001c3b51df75784c5d8ce454697d0e86264f1d88da392ea211f662f9" dependencies = [ "hex", "proc-macro2", @@ -88,9 +90,9 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.48.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bd18dbc72c83aa2e9ad3f4a00dcc27c03ada66c13f9056001dc9157055d616" +checksum = "42a7f031a91eb7360be47ad19c06ed1246486eb789ef8091df0646de85071f7d" dependencies = [ "multiversx-sc", ] @@ -106,27 +108,27 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -158,15 +160,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.48" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", @@ -178,3 +180,9 @@ name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unwrap-infallible" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151ac09978d3c2862c4e39b557f4eceee2cc72150bc4cb4f16abf061b6e381fb" diff --git a/router-mock/wasm/Cargo.toml b/router-mock/wasm/Cargo.toml index 8ae5f4a..5f06eda 100644 --- a/router-mock/wasm/Cargo.toml +++ b/router-mock/wasm/Cargo.toml @@ -21,11 +21,14 @@ debug = false panic = "abort" overflow-checks = false +[profile.dev] +panic = "abort" + [dependencies.router-mock] path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "=0.48.0" +version = "=0.50.0" [workspace] members = ["."] diff --git a/router-mock/wasm/src/lib.rs b/router-mock/wasm/src/lib.rs index 8b737a5..3b28f06 100644 --- a/router-mock/wasm/src/lib.rs +++ b/router-mock/wasm/src/lib.rs @@ -10,8 +10,6 @@ // Total number of exported functions: 3 #![no_std] -#![allow(internal_features)] -#![feature(lang_items)] multiversx_sc_wasm_adapter::allocator!(); multiversx_sc_wasm_adapter::panic_handler!();