From 0e867368f2b156f7ee1320b14dd720fc5a0ee7c2 Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Mon, 21 Aug 2023 19:09:03 +0300 Subject: [PATCH 1/6] Version 1.44.2 --- api/derive/Cargo.toml | 2 +- api/info/Cargo.toml | 2 +- api/test/Cargo.toml | 2 +- ton_client/Cargo.toml | 2 +- ton_client_processing/Cargo.toml | 2 +- ton_sdk/Cargo.toml | 2 +- toncli/Cargo.toml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/derive/Cargo.toml b/api/derive/Cargo.toml index a5bf91dd..6c066849 100644 --- a/api/derive/Cargo.toml +++ b/api/derive/Cargo.toml @@ -2,7 +2,7 @@ authors = [ 'TON Labs LTD ' ] edition = '2018' name = 'api_derive' -version = '1.44.1' +version = '1.44.2' [dependencies] quote = '1.0.26' diff --git a/api/info/Cargo.toml b/api/info/Cargo.toml index daa81cb0..b3958047 100644 --- a/api/info/Cargo.toml +++ b/api/info/Cargo.toml @@ -2,7 +2,7 @@ authors = [ 'TON Labs LTD ' ] edition = '2018' name = 'api_info' -version = '1.44.1' +version = '1.44.2' [dependencies] serde = '1.0.115' diff --git a/api/test/Cargo.toml b/api/test/Cargo.toml index 9efef3e4..fa6fcbd6 100644 --- a/api/test/Cargo.toml +++ b/api/test/Cargo.toml @@ -2,7 +2,7 @@ authors = [ 'TON Labs LTD ' ] edition = '2018' name = 'api_test' -version = '1.44.1' +version = '1.44.2' [dependencies] serde = '1.0.115' diff --git a/ton_client/Cargo.toml b/ton_client/Cargo.toml index ff2a31f1..c2fb3d43 100644 --- a/ton_client/Cargo.toml +++ b/ton_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'ton_client' -version = '1.44.1' +version = '1.44.2' authors = [ 'TON Labs LTD ' ] edition = '2018' license = 'Apache-2.0' diff --git a/ton_client_processing/Cargo.toml b/ton_client_processing/Cargo.toml index 9367066d..6cd4e5a8 100644 --- a/ton_client_processing/Cargo.toml +++ b/ton_client_processing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'ton_client_processing' -version = '1.44.1' +version = '1.44.2' authors = [ 'TON Labs LTD ' ] edition = '2018' license = 'Apache-2.0' diff --git a/ton_sdk/Cargo.toml b/ton_sdk/Cargo.toml index 1574b564..e7c1c19a 100644 --- a/ton_sdk/Cargo.toml +++ b/ton_sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'ton_sdk' -version = '1.44.1' +version = '1.44.2' edition = '2018' license = 'Apache-2.0' authors = [ 'TON Labs LTD ' ] diff --git a/toncli/Cargo.toml b/toncli/Cargo.toml index 6984842b..a10d333c 100644 --- a/toncli/Cargo.toml +++ b/toncli/Cargo.toml @@ -9,7 +9,7 @@ license = 'Apache-2.0' name = 'toncli' readme = 'README.md' repository = 'https://github.com/tonlabs/ever-sdk' -version = '1.44.1' +version = '1.44.2' [dependencies] base64 = '0.13.0' From 94ce46cfda7f360d4fea3a6388f80b559603df8d Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Mon, 21 Aug 2023 21:48:55 +0300 Subject: [PATCH 2/6] Parse pruned account --- CHANGELOG.md | 5 + Cargo.lock | 570 ++++++++++++++----------------- ton_client/Cargo.toml | 14 +- ton_client/src/boc/internal.rs | 2 +- ton_client/src/boc/parse.rs | 18 +- ton_client/src/boc/tests.rs | 42 ++- ton_client_processing/Cargo.toml | 4 +- ton_sdk/Cargo.toml | 6 +- 8 files changed, 331 insertions(+), 330 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a01288fe..328d1b95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. +## [1.44.2] – 2023-07-25 + +### New + +- Pruned account serialization supported ## [1.44.1] – 2023-07-25 diff --git a/Cargo.lock b/Cargo.lock index b8e395ce..2d517c78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -74,9 +74,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -107,13 +107,13 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "api_derive" -version = "1.44.1" +version = "1.44.2" dependencies = [ "api_info", "proc-macro2", @@ -124,7 +124,7 @@ dependencies = [ [[package]] name = "api_info" -version = "1.44.1" +version = "1.44.2" dependencies = [ "serde", "serde_derive", @@ -133,7 +133,7 @@ dependencies = [ [[package]] name = "api_test" -version = "1.44.1" +version = "1.44.2" dependencies = [ "api_derive", "api_info", @@ -176,13 +176,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] @@ -193,9 +193,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", @@ -254,6 +254,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "block-buffer" version = "0.9.0" @@ -296,7 +302,7 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -325,11 +331,12 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -406,7 +413,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.22", + "time 0.3.26", "version_check", ] @@ -423,7 +430,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "time 0.3.22", + "time 0.3.26", "url", ] @@ -445,9 +452,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -512,16 +519,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "ctr" version = "0.6.0" @@ -544,6 +541,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + [[package]] name = "derivative" version = "2.2.0" @@ -668,9 +671,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" @@ -681,15 +684,21 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -704,14 +713,14 @@ dependencies = [ [[package]] name = "ever-struct" -version = "0.1.2" -source = "git+https://github.com/tonlabs/ever-struct.git?tag=0.1.2#aef694e4fa00040c51c05b71f4a83f0a50030a5b" +version = "1.0.2" +source = "git+https://github.com/tonlabs/ever-struct.git?tag=1.0.2#02b2a4ea4b6b86e1ff6168baad4a5fffbe3ab5e7" dependencies = [ "anyhow", "failure", "hex-literal", "ton_block", - "ton_types 2.0.15", + "ton_types 2.0.18", ] [[package]] @@ -744,12 +753,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "float-cmp" @@ -846,7 +852,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] @@ -933,9 +939,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -943,7 +949,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -960,19 +966,16 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.2.6" +name = "hashbrown" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -1029,7 +1032,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1062,9 +1065,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1074,9 +1077,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1089,7 +1092,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1190,34 +1193,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", + "hashbrown 0.12.3", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "indexmap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", + "equivalent", + "hashbrown 0.14.0", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "itertools" @@ -1230,9 +1223,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -1271,9 +1264,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libsecp256k1" @@ -1331,9 +1324,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1355,9 +1348,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "serde", ] @@ -1400,7 +1393,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -1423,9 +1416,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1438,7 +1431,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -1467,9 +1460,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", @@ -1492,9 +1485,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -1545,28 +1538,28 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "object" -version = "0.30.4" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -1585,11 +1578,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -1606,7 +1599,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] @@ -1617,9 +1610,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -1636,15 +1629,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "owned-alloc" version = "0.2.0" @@ -1700,9 +1684,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9" +checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ "thiserror", "ucd-trie", @@ -1710,9 +1694,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef623c9bbfa0eedf5a0efba11a5ee83209c326653ca31ff019bec3a95bfff2b" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" dependencies = [ "pest", "pest_generator", @@ -1720,22 +1704,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e8cba4ec22bada7fc55ffe51e2deb6a0e0db2d0b7ab0b103acc80d2510c190" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] name = "pest_meta" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01f71cb40bd8bb94232df14b946909e14660e33fc05db3e50ae2a82d7ea0ca0" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" dependencies = [ "once_cell", "pest", @@ -1744,9 +1728,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -1814,21 +1798,19 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1851,9 +1833,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1935,7 +1917,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1944,7 +1926,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1960,12 +1942,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", + "regex-automata 0.3.6", "regex-syntax", ] @@ -1975,11 +1958,22 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +[[package]] +name = "regex-automata" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" @@ -2034,23 +2028,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "salsa20" @@ -2063,18 +2056,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" @@ -2099,11 +2092,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2112,9 +2105,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -2122,9 +2115,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -2141,22 +2134,22 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -2164,13 +2157,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] @@ -2191,7 +2184,7 @@ version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "ryu", "serde", "yaml-rust", @@ -2258,9 +2251,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -2272,6 +2265,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "sodalite" version = "0.3.0" @@ -2300,9 +2303,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -2323,16 +2326,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if 1.0.0", "fastrand", "redox_syscall 0.3.5", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2343,29 +2345,29 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] name = "thread-id" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee93aa2b8331c0fec9091548843f2c90019571814057da3b783f9de09349d73" +checksum = "79474f573561cdc4871a0de34a51c92f7f5a56039113fbb5b9c9f96bdb756669" dependencies = [ "libc", "redox_syscall 0.2.16", @@ -2385,10 +2387,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -2403,9 +2406,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" dependencies = [ "time-core", ] @@ -2446,19 +2449,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2469,7 +2472,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] @@ -2523,8 +2526,8 @@ dependencies = [ [[package]] name = "ton_abi" -version = "2.3.126" -source = "git+https://github.com/tonlabs/ever-abi.git?tag=2.3.126#310ddff3cceecbcab6b827b7cb192af2e3cd3378" +version = "2.3.131" +source = "git+https://github.com/tonlabs/ever-abi.git?tag=2.3.131#4cc96f046abee55b28678226c533e3bd66885a24" dependencies = [ "base64 0.10.1", "byteorder", @@ -2540,13 +2543,13 @@ dependencies = [ "serde_json", "sha2 0.10.7", "ton_block", - "ton_types 2.0.15", + "ton_types 2.0.18", ] [[package]] name = "ton_api" -version = "0.3.20" -source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.20#ea8a77dd7c208b334efe242b4e291f12dfa12428" +version = "0.3.25" +source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.25#67be17a07799e2c0d61d07eaf104f7c0c4bb7006" dependencies = [ "byteorder", "extfmt", @@ -2560,13 +2563,13 @@ dependencies = [ "serde_json", "ton_block", "ton_tl_codegen", - "ton_types 2.0.15", + "ton_types 2.0.18", ] [[package]] name = "ton_block" -version = "1.9.84" -source = "git+https://github.com/tonlabs/ever-block.git?tag=1.9.84#2eec36212d613f9fca46c89603504d481507421a" +version = "1.9.89" +source = "git+https://github.com/tonlabs/ever-block.git?tag=1.9.89#2d80268af9c81addd89e32cdc0bab28789316ada" dependencies = [ "base64 0.13.1", "crc 3.0.1", @@ -2578,13 +2581,13 @@ dependencies = [ "num", "num-traits", "sha2 0.10.7", - "ton_types 2.0.15", + "ton_types 2.0.18", ] [[package]] name = "ton_block_json" -version = "0.7.163" -source = "git+https://github.com/tonlabs/ever-block-json.git?tag=0.7.163#85d4ccb1bc06bb025543962af4bf7381ac1c9b45" +version = "0.7.170" +source = "git+https://github.com/tonlabs/ever-block-json.git?tag=0.7.170#03e78c8c0337893a302bcb205aabf503ca2da5c3" dependencies = [ "base64 0.13.1", "failure", @@ -2596,12 +2599,12 @@ dependencies = [ "serde_json", "ton_api", "ton_block", - "ton_types 2.0.15", + "ton_types 2.0.18", ] [[package]] name = "ton_client" -version = "1.44.1" +version = "1.44.2" dependencies = [ "aes", "api_derive", @@ -2657,7 +2660,7 @@ dependencies = [ "ton_client_processing", "ton_executor", "ton_sdk", - "ton_types 2.0.15", + "ton_types 2.0.18", "ton_vm", "wasm-bindgen", "wasm-bindgen-futures", @@ -2668,7 +2671,7 @@ dependencies = [ [[package]] name = "ton_client_processing" -version = "1.44.1" +version = "1.44.2" dependencies = [ "api_derive", "api_info", @@ -2682,25 +2685,25 @@ dependencies = [ "serde_repr", "tokio", "ton_block", - "ton_types 2.0.15", + "ton_types 2.0.18", ] [[package]] name = "ton_executor" -version = "1.16.53" -source = "git+https://github.com/tonlabs/ever-executor.git?tag=1.16.53#a48e02544eb6eec16c991406bea43d4a0ba0b49c" +version = "1.16.61" +source = "git+https://github.com/tonlabs/ever-executor.git?tag=1.16.61#17f7fa9c178bf4502b27af72fc6369690c6f58d0" dependencies = [ "failure", "lazy_static", "log", "ton_block", - "ton_types 2.0.15", + "ton_types 2.0.18", "ton_vm", ] [[package]] name = "ton_sdk" -version = "1.44.1" +version = "1.44.2" dependencies = [ "api_derive", "api_info", @@ -2719,13 +2722,13 @@ dependencies = [ "sha2 0.9.9", "ton_abi", "ton_block", - "ton_types 2.0.15", + "ton_types 2.0.18", ] [[package]] name = "ton_tl_codegen" version = "0.1.0" -source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.20#ea8a77dd7c208b334efe242b4e291f12dfa12428" +source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.25#67be17a07799e2c0d61d07eaf104f7c0c4bb7006" dependencies = [ "crc 1.8.1", "failure", @@ -2759,8 +2762,8 @@ dependencies = [ [[package]] name = "ton_types" -version = "2.0.15" -source = "git+https://github.com/tonlabs/ever-types.git?tag=2.0.15#466012683d32b4f19563039393c35b362eadb245" +version = "2.0.18" +source = "git+https://github.com/tonlabs/ever-types.git?tag=2.0.18#cc9e204f9122967b0f1d5af3208f8ccc36e706ef" dependencies = [ "aes-ctr", "base64 0.13.1", @@ -2786,8 +2789,8 @@ dependencies = [ [[package]] name = "ton_vm" -version = "1.8.184" -source = "git+https://github.com/tonlabs/ever-vm.git?tag=1.8.184#5bd9fe532efe2599ccea643ea8fd92090e3d0f34" +version = "1.8.192" +source = "git+https://github.com/tonlabs/ever-vm.git?tag=1.8.192#58924257103ef49186f26e581b35a459a7b6cb1f" dependencies = [ "diffy", "ed25519", @@ -2801,13 +2804,13 @@ dependencies = [ "rand 0.7.3", "similar", "ton_block", - "ton_types 2.0.15", + "ton_types 2.0.18", "zstd", ] [[package]] name = "toncli" -version = "1.44.1" +version = "1.44.2" dependencies = [ "api_info", "assert_cmd", @@ -2891,9 +2894,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicode-bidi" @@ -2903,9 +2906,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -3055,7 +3058,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -3089,7 +3092,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3141,21 +3144,6 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -3167,102 +3155,60 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winreg" @@ -3316,7 +3262,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] diff --git a/ton_client/Cargo.toml b/ton_client/Cargo.toml index c2fb3d43..53712edd 100644 --- a/ton_client/Cargo.toml +++ b/ton_client/Cargo.toml @@ -21,13 +21,13 @@ api_info = { path = '../api/info' } ton_sdk = { default-features = false, path = '../ton_sdk' } ton_client_processing = { default-features = false, path = '../ton_client_processing' } -ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.126' } -ton_block = { features = ["fast_finality"], git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.84' } -ton_block_json = { git = 'https://github.com/tonlabs/ever-block-json.git', tag = '0.7.163' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.15' } -ton_executor = { features = ['signature_with_id'], git = 'https://github.com/tonlabs/ever-executor.git', tag = '1.16.53' } -ton_vm = { features = ['signature_with_id', 'signature_no_check'], git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.8.184' } -ever-struct = { git = 'https://github.com/tonlabs/ever-struct.git', tag = '0.1.2' } +ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.131' } +ton_block = { features = ["fast_finality"], git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.89' } +ton_block_json = { git = 'https://github.com/tonlabs/ever-block-json.git', tag = '0.7.170' } +ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.18' } +ton_executor = { features = ['signature_with_id'], git = 'https://github.com/tonlabs/ever-executor.git', tag = '1.16.61' } +ton_vm = { features = ['signature_with_id', 'signature_no_check'], git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.8.192' } +ever-struct = { git = 'https://github.com/tonlabs/ever-struct.git', tag = '1.0.2' } lockfree = { git = 'https://github.com/tonlabs/lockfree.git', package = 'lockfree' } sodalite = { features = [ 'rand' ], git = 'https://github.com/tonlabs/sodalite.git' } diff --git a/ton_client/src/boc/internal.rs b/ton_client/src/boc/internal.rs index c04592f3..937928fb 100644 --- a/ton_client/src/boc/internal.rs +++ b/ton_client/src/boc/internal.rs @@ -17,7 +17,7 @@ use crate::ClientContext; #[allow(unused_imports)] use std::str::FromStr; use ton_block::{Deserializable, Serializable}; -use ton_types::{UInt256}; +use ton_types::UInt256; pub(crate) fn get_boc_hash(boc: &[u8]) -> ClientResult { let cells = diff --git a/ton_client/src/boc/parse.rs b/ton_client/src/boc/parse.rs index 76eaef4a..f1c8ced6 100644 --- a/ton_client/src/boc/parse.rs +++ b/ton_client/src/boc/parse.rs @@ -16,6 +16,9 @@ use crate::boc::Error; use crate::client::ClientContext; use crate::error::ClientResult; use serde_json::Value; +use ton_block::Deserializable; + +use super::internal::{deserialize_cell_from_boc, deserialize_object_from_cell}; #[derive(Serialize, Deserialize, Clone, ApiType, Default)] pub struct ParamsOfParse { @@ -114,12 +117,21 @@ pub fn parse_account( context: std::sync::Arc, params: ParamsOfParse, ) -> ClientResult { - let object = deserialize_object_from_boc::(&context, ¶ms.boc, "account")?; + let (boc, cell) = deserialize_cell_from_boc(&context, ¶ms.boc, "account")?; + + let account = if cell.cell_type() == ton_types::CellType::MerkleProof { + let proof = ton_block::MerkleProof::construct_from_cell(cell) + .map_err(|err| Error::invalid_boc(format!("Can not deserialize Merkle proof from pruned account BOC: {}", err)))?; + proof.virtualize() + .map_err(|err| Error::invalid_boc(format!("Can not virtualize pruned account from Merkle proof: {}", err)))? + } else { + deserialize_object_from_cell(cell, "account")? + }; let set = ton_block_json::AccountSerializationSet { - boc: object.boc.bytes("account")?, + boc: boc.bytes("account")?, proof: None, - account: object.object, + account, ..Default::default() }; diff --git a/ton_client/src/boc/tests.rs b/ton_client/src/boc/tests.rs index b8679665..3e19769a 100644 --- a/ton_client/src/boc/tests.rs +++ b/ton_client/src/boc/tests.rs @@ -16,6 +16,7 @@ use crate::abi::{ CallSet, DeploySet, FunctionHeader, ParamsOfEncodeMessage, ResultOfEncodeMessage, Signer, }; use crate::api_info::ApiModule; +use crate::boc::internal::deserialize_object_from_boc_bin; use crate::boc::tvc::{ParamsOfDecodeTvc, ResultOfDecodeTvc}; use crate::crypto::KeyPair; use crate::json_interface::modules::BocModule; @@ -429,7 +430,7 @@ fn get_code_from_tvc() { "te6ccgECFgEAA/8AAib/APSkICLAAZL0oOGK7VNYMPShAwEBCvSkIPShAgAAAgEgBgQB6P9/IdMAAY4mgQIA1xgg+QEBcO1E0PQFgED0DvKK1wv/Ae1HIm917VcDAfkQ8qje7UTQINdJwgGOFvQE0z/TAO1HAW9xAW92AW9zAW9y7VeOGPQF7UcBb3Jwb3Nwb3bIgCDPQMnQb3HtV+LTPwHtR28TIbkgBQBgnzAg+COBA+iogggbd0Cgud6Z7Uchb1Mg7VcwlIA08vDiMNMfAfgjvPK50x8B8UABAgEgEgcCASALCAEJuotV8/gJAfrtR29hbo477UTQINdJwgGOFvQE0z/TAO1HAW9xAW92AW9zAW9y7VeOGPQF7UcBb3Jwb3Nwb3bIgCDPQMnQb3HtV+Le7UdvFpLyM5ftR3FvVu1X4gD4ANH4I7Uf7UcgbxEwAcjLH8nQb1HtV+1HbxLI9ADtR28Tzws/7UdvFgoAHM8LAO1HbxHPFsntVHBqAgFqDwwBCbQAGtbADQH87UdvYW6OO+1E0CDXScIBjhb0BNM/0wDtRwFvcQFvdgFvcwFvcu1Xjhj0Be1HAW9ycG9zcG92yIAgz0DJ0G9x7Vfi3u1Hb2UgbpIwcN5w7UdvEoBA9A7yitcL/7ry4GT4APpA0SDIyfsEgQPocIEAgMhxzwsBIs8KAHHPQPgoDgCOzxYkzxYj+gJxz0Bw+gJw+gKAQM9A+CPPCx9yz0AgySL7AF8FMO1HbxLI9ADtR28Tzws/7UdvFs8LAO1HbxHPFsntVHBq2zABCbRl9ovAEAH47UdvYW6OO+1E0CDXScIBjhb0BNM/0wDtRwFvcQFvdgFvcwFvcu1Xjhj0Be1HAW9ycG9zcG92yIAgz0DJ0G9x7Vfi3tHtR28R1wsfyIIQUMvtF4IQgAAAALHPCx8hzwsfyHPPCwH4KM8Wcs9A+CXPCz+AIc9AIM81Is8xvBEAeJZxz0AhzxeVcc9BIc3iIMlx+wBbIcD/jh7tR28SyPQA7UdvE88LP+1HbxbPCwDtR28RzxbJ7VTecWrbMAIBIBUTAQm7cxLkWBQA+O1Hb2FujjvtRNAg10nCAY4W9ATTP9MA7UcBb3EBb3YBb3MBb3LtV44Y9AXtRwFvcnBvc3BvdsiAIM9AydBvce1X4t74ANH4I7Uf7UcgbxEwAcjLH8nQb1HtV+1HbxLI9ADtR28Tzws/7UdvFs8LAO1HbxHPFsntVHBq2zAAyt1wIddJIMEgjisgwACOHCPQc9ch1wsAIMABltswXwfbMJbbMF8H2zDjBNmW2zBfBtsw4wTZ4CLTHzQgdLsgjhUwIIIQ/////7ogmTAgghD////+ut/fltswXwfbMOAjIfFAAV8H" ); - let tvc_boc = "te6ccgEBBQEAMgACCQFn9wzgAwEBAtACACZTb21lIFNtYXJ0IENvbnRyYWN0ART/APSkE/S88sgLBAAC0w=="; + let tvc_boc = "te6ccgEBBAEALgACCaLwuBzgAgEAJlNvbWUgU21hcnQgQ29udHJhY3QBFP8A9KQT9LzyyAsDAALT"; let code_boc = "te6ccgEBAgEAEAABFP8A9KQT9LzyyAsBAALT"; let result: ResultOfGetCodeFromTvc = client @@ -490,6 +491,43 @@ fn parse_account() { assert_eq!(result.parsed["balance"], "0x958a26eb8e7a18d"); } +#[test] +fn parse_pruned_account() { + let client = TestClient::new(); + + let (account, _) = deserialize_object_from_boc_bin::(include_bytes!("test_data/account.boc")).unwrap(); + + let code = account.get_code().map(|cell| cell.repr_hash()); + let data = account.get_data().map(|cell| cell.repr_hash()); + let libs = account.libraries().root().map(|cell| cell.repr_hash()); + + let cell = account.serialize().unwrap(); + + let proof = ton_block::MerkleProof::create( + &cell, + |hash| Some(hash) != code.as_ref() && Some(hash) != data.as_ref() && Some(hash) != libs.as_ref() + ).unwrap(); + let boc = proof.write_to_bytes().unwrap(); + + let result: ResultOfParse = client + .request( + "boc.parse_account", + ParamsOfParse { + boc: base64::encode(&boc), + }, + ) + .unwrap(); + + assert_eq!( + result.parsed["id"], + "0:2bb4a0e8391e7ea8877f4825064924bd41ce110fce97e939d3323999e1efbb13" + ); + assert!(result.parsed["data"].is_null()); + assert_eq!(result.parsed["data_hash"], "8ec587d3f253261f8b1e49c1201e912136c5feba29b184b2b56cf5727e9d79dd"); + assert!(result.parsed["code"].is_null()); + assert_eq!(result.parsed["code_hash"], "ccbfc821853aa641af3813ebd477e26818b51e4ca23e5f6d34509215aa7123d9"); +} + #[test] fn parse_transaction() { let client = TestClient::new(); @@ -902,7 +940,7 @@ fn encode_external_in_message() { #[test] fn test_decode_tvc() { let client = TestClient::new(); - let tvc_boc = "te6ccgEBBQEAMgACCQFn9wzgAwEBAtACACZTb21lIFNtYXJ0IENvbnRyYWN0ART/APSkE/S88sgLBAAC0w=="; + let tvc_boc = "te6ccgEBBAEALgACCaLwuBzgAgEAJlNvbWUgU21hcnQgQ29udHJhY3QBFP8A9KQT9LzyyAsDAALT"; let code_boc = "te6ccgEBAgEAEAABFP8A9KQT9LzyyAsBAALT"; let description = "Some Smart Contract"; diff --git a/ton_client_processing/Cargo.toml b/ton_client_processing/Cargo.toml index 6cd4e5a8..2be41a8a 100644 --- a/ton_client_processing/Cargo.toml +++ b/ton_client_processing/Cargo.toml @@ -10,8 +10,8 @@ name = 'ton_client_processing' crate-type = [ 'cdylib', 'rlib', 'staticlib' ] [dependencies] -ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.84' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.15' } +ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.89' } +ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.18' } api_derive = { path = '../api/derive' } api_info = { path = '../api/info' } diff --git a/ton_sdk/Cargo.toml b/ton_sdk/Cargo.toml index e7c1c19a..32955cb3 100644 --- a/ton_sdk/Cargo.toml +++ b/ton_sdk/Cargo.toml @@ -6,9 +6,9 @@ license = 'Apache-2.0' authors = [ 'TON Labs LTD ' ] [dependencies] -ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.126' } -ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.84' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.15' } +ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.131' } +ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.89' } +ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.18' } api_info = { path = '../api/info' } api_derive = { path = '../api/derive' } From 9f34d9394d7180b0153bfecaf9694d6d8ee9321f Mon Sep 17 00:00:00 2001 From: Sergei Voronezhskii Date: Tue, 22 Aug 2023 15:18:28 +0300 Subject: [PATCH 3/6] Version 1.44.2 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 328d1b95..67775755 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## [1.44.2] – 2023-07-25 +## [1.44.2] – 2023-08-22 ### New From 871257f5f850bcaffcf67965397856301684531d Mon Sep 17 00:00:00 2001 From: tonjen Date: Tue, 22 Aug 2023 12:23:15 +0000 Subject: [PATCH 4/6] Update docs --- tools/api.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/api.json b/tools/api.json index e8d0b2f4..7844cf5f 100644 --- a/tools/api.json +++ b/tools/api.json @@ -1,5 +1,5 @@ { - "version": "1.44.1", + "version": "1.44.2", "modules": [ { "name": "client", From 68b8cb5f87802619df6f6dbf95135455bd0eab84 Mon Sep 17 00:00:00 2001 From: tonjen Date: Tue, 22 Aug 2023 12:26:53 +0000 Subject: [PATCH 5/6] Update trusted blocks --- ton_client/src/proofs/trusted_key_blocks.bin | Bin 446128 -> 464704 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ton_client/src/proofs/trusted_key_blocks.bin b/ton_client/src/proofs/trusted_key_blocks.bin index f1d13c9c4bbe46dcea5ebd5630ae202530ee24ab..13611c2e21ae01902c996ee1f0f63c4e3db45b0f 100644 GIT binary patch delta 18770 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 DZ0ruR From 73855ea17ff45cd96b51ac1dc2a67621b1afb1e4 Mon Sep 17 00:00:00 2001 From: Sergei Voronezhskii Date: Wed, 23 Aug 2023 10:57:15 +0300 Subject: [PATCH 6/6] Ignore debot tests --- ton_client/src/debot/tests.rs | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/ton_client/src/debot/tests.rs b/ton_client/src/debot/tests.rs index 9b38a98d..85673a99 100644 --- a/ton_client/src/debot/tests.rs +++ b/ton_client/src/debot/tests.rs @@ -803,6 +803,7 @@ async fn get_code_hash_from_tvc(client: Arc, name: &str) -> String { const EXIT_CHOICE: u8 = 9; #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_goto() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_debot(client.clone()).await; @@ -823,6 +824,7 @@ async fn test_debot_goto() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_print() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr, keys, abi } = init_debot(client.clone()).await; @@ -845,6 +847,7 @@ async fn test_debot_print() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_runact() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_debot(client.clone()).await; @@ -869,6 +872,7 @@ async fn test_debot_runact() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_run_method() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_debot(client.clone()).await; @@ -891,6 +895,7 @@ async fn test_debot_run_method() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_send_msg() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_debot(client.clone()).await; @@ -914,6 +919,7 @@ async fn test_debot_send_msg() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_invoke_debot() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_debot(client.clone()).await; @@ -942,6 +948,7 @@ async fn test_debot_invoke_debot() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_engine_calls() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_debot(client.clone()).await; @@ -967,6 +974,7 @@ async fn test_debot_engine_calls() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_interface_call() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_debot(client.clone()).await; @@ -987,6 +995,7 @@ async fn test_debot_interface_call() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_inner_interfaces() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_debot3(client.clone()).await; @@ -1025,6 +1034,7 @@ async fn test_debot_inner_interfaces() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_4() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr, keys, abi } = init_debot4(client.clone()).await; @@ -1078,6 +1088,7 @@ async fn test_debot_4() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_msg_interface() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_debot2(client.clone()).await; @@ -1119,6 +1130,7 @@ async fn test_debot_msg_interface() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_invoke_msgs() { let client = Arc::new(TestClient::new()); let (debot1, _, abi) = init_debot_pair(client.clone(), TEST_DEBOTA, TEST_DEBOTB).await; @@ -1140,6 +1152,7 @@ async fn test_debot_invoke_msgs() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_sdk_get_accounts_by_hash() { let client = Arc::new(TestClient::new()); let deploy_count = 8; @@ -1158,6 +1171,7 @@ async fn test_debot_sdk_get_accounts_by_hash() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_getinfo() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_hello_debot(client.clone()).await; @@ -1192,6 +1206,7 @@ async fn test_debot_getinfo() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_approve() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot6").await; @@ -1245,6 +1260,7 @@ async fn test_debot_approve() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_json_interface() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot7").await; @@ -1298,6 +1314,7 @@ async fn test_debot_network_interface() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_transaction_chain() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot9").await; @@ -1314,6 +1331,7 @@ async fn test_debot_transaction_chain() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_encryption_box() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot10").await; @@ -1333,6 +1351,7 @@ async fn test_debot_encryption_box() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_encryption_box_get_info() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot11").await; @@ -1352,6 +1371,7 @@ async fn test_debot_encryption_box_get_info() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_signing_box_get_info() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot12").await; @@ -1371,6 +1391,7 @@ async fn test_debot_signing_box_get_info() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_query() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot14").await; @@ -1389,6 +1410,7 @@ async fn test_debot_query() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_json_parse() { let client = Arc::new(TestClient::new()); let DebotData { @@ -1418,6 +1440,7 @@ async fn test_debot_json_parse() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_custom_header() { let client = Arc::new(TestClient::new()); //deply CustomReplayProtection contract @@ -1477,6 +1500,7 @@ async fn test_debot_custom_header() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_target_abi() { let client = Arc::new(TestClient::new()); let DebotData {debot_addr, target_addr: _, keys, abi} = @@ -1496,6 +1520,7 @@ async fn test_debot_target_abi() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_msg_sendasync_and_waitforcollection() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot17").await; @@ -1515,6 +1540,7 @@ async fn test_debot_msg_sendasync_and_waitforcollection() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_query_query() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot18").await; @@ -1533,6 +1559,7 @@ async fn test_debot_query_query() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_transaction_result() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(client.clone(), "testDebot19").await; @@ -1551,6 +1578,7 @@ async fn test_debot_transaction_result() { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] +#[ignore] async fn test_debot_sign_hash() { let client = Arc::new(TestClient::new()); let DebotData { debot_addr, target_addr: _, keys, abi } = init_simple_debot(