diff --git a/CHANGELOG.md b/CHANGELOG.md index 0df02547..898a45fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## Version: 0.27.1 + +### Breaking changes: + - Commands `convert` and `callex` were removed. + + ## Version: 0.26.45 ### New diff --git a/Cargo.lock b/Cargo.lock index c55f78fe..7631de4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher 0.3.0", "cpufeatures", "opaque-debug 0.3.0", @@ -55,13 +55,19 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] +[[package]] +name = "anyhow" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" + [[package]] name = "api_derive" -version = "1.34.3" -source = "git+https://github.com/tonlabs/TON-SDK.git?tag=1.34.3#ddc10c9dfc71786b8ea5c9d8d89ddbfd73869771" +version = "1.35.0" +source = "git+https://github.com/tonlabs/TON-SDK.git?tag=1.35.0#3cfcb2516aa5e64e8cb9992605838e2f90bfe789" dependencies = [ "api_info", "quote", @@ -71,8 +77,8 @@ dependencies = [ [[package]] name = "api_info" -version = "1.34.3" -source = "git+https://github.com/tonlabs/TON-SDK.git?tag=1.34.3#ddc10c9dfc71786b8ea5c9d8d89ddbfd73869771" +version = "1.35.0" +source = "git+https://github.com/tonlabs/TON-SDK.git?tag=1.35.0#3cfcb2516aa5e64e8cb9992605838e2f90bfe789" dependencies = [ "serde", "serde_derive", @@ -118,7 +124,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -135,7 +141,7 @@ checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -205,6 +211,15 @@ dependencies = [ "generic-array 0.14.5", ] +[[package]] +name = "block-buffer" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +dependencies = [ + "generic-array 0.14.5", +] + [[package]] name = "block-modes" version = "0.8.1" @@ -265,12 +280,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.1.0" @@ -286,12 +295,6 @@ dependencies = [ "jobserver", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -323,7 +326,7 @@ dependencies = [ "num-integer", "num-traits", "time", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -369,7 +372,7 @@ dependencies = [ "libc", "once_cell", "terminal_size", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -407,14 +410,20 @@ dependencies = [ ] [[package]] -name = "crc-any" -version = "2.4.3" +name = "crc" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774646b687f63643eb0f4bf13dc263cb581c8c9e57973b6ddf78bda3994d88df" +checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" dependencies = [ - "debug-helper", + "crc-catalog", ] +[[package]] +name = "crc-catalog" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" + [[package]] name = "crc16" version = "0.4.0" @@ -430,11 +439,11 @@ dependencies = [ "bitflags", "crossterm_winapi", "libc", - "mio 0.8.4", + "mio", "parking_lot", "signal-hook", "signal-hook-mio", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -443,7 +452,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -453,13 +462,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "crypto-mac" -version = "0.7.0" +name = "crypto-common" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" +checksum = "5999502d32b9c48d492abe66392408144895020ec4709e549e840799f3bb74c0" dependencies = [ - "generic-array 0.12.4", - "subtle 1.0.0", + "generic-array 0.14.5", + "typenum", ] [[package]] @@ -469,7 +478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.5", - "subtle 2.4.1", + "subtle", ] [[package]] @@ -479,7 +488,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ "generic-array 0.14.5", - "subtle 2.4.1", + "subtle", ] [[package]] @@ -491,16 +500,10 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle 2.4.1", + "subtle", "zeroize", ] -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - [[package]] name = "difference" version = "2.0.0" @@ -531,6 +534,17 @@ dependencies = [ "generic-array 0.14.5", ] +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer 0.10.2", + "crypto-common", + "subtle", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -562,9 +576,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" [[package]] name = "encode_unicode" @@ -578,7 +592,7 @@ version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -664,22 +678,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - [[package]] name = "futures" version = "0.3.21" @@ -764,7 +762,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite", "pin-utils", "slab", ] @@ -794,7 +792,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -805,7 +803,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] @@ -818,11 +816,11 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "h2" -version = "0.2.7" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ - "bytes 0.5.6", + "bytes", "fnv", "futures-core", "futures-sink", @@ -830,18 +828,11 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 0.2.25", + "tokio", "tokio-util", "tracing", - "tracing-futures", ] -[[package]] -name = "hashbrown" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" - [[package]] name = "hashbrown" version = "0.11.2" @@ -851,6 +842,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -872,16 +869,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hmac" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" -dependencies = [ - "crypto-mac 0.7.0", - "digest 0.8.1", -] - [[package]] name = "hmac" version = "0.8.1" @@ -902,6 +889,15 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.3", +] + [[package]] name = "hmac-drbg" version = "0.3.0" @@ -919,7 +915,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -928,19 +924,20 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.1.0", + "bytes", "fnv", - "itoa 1.0.2", + "itoa", ] [[package]] name = "http-body" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 0.5.6", + "bytes", "http", + "pin-project-lite", ] [[package]] @@ -951,17 +948,17 @@ checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" -version = "0.3.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.13.10" +version = "0.14.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" dependencies = [ - "bytes 0.5.6", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -970,10 +967,10 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 0.4.8", - "pin-project 1.0.10", + "itoa", + "pin-project-lite", "socket2", - "tokio 0.2.25", + "tokio", "tower-service", "tracing", "want", @@ -981,15 +978,15 @@ dependencies = [ [[package]] name = "hyper-tls" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 0.5.6", + "bytes", "hyper", "native-tls", - "tokio 0.2.25", - "tokio-tls", + "tokio", + "tokio-native-tls", ] [[package]] @@ -1011,12 +1008,12 @@ checksum = "4161ceaf2f41b6cd3f6502f5da085d4ad4393a51e0c70ed2fce1d5698d798fae" [[package]] name = "indexmap" -version = "1.6.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.9.1", + "hashbrown 0.12.1", ] [[package]] @@ -1031,31 +1028,13 @@ dependencies = [ "regex", ] -[[package]] -name = "input_buffer" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754" -dependencies = [ - "bytes 0.5.6", -] - [[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", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", + "cfg-if", ] [[package]] @@ -1073,12 +1052,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.2" @@ -1103,16 +1076,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -1152,7 +1115,7 @@ checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.4.1", + "subtle", ] [[package]] @@ -1197,14 +1160,14 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "lru" -version = "0.6.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea2d928b485416e8908cff2d97d621db22b27f7b3b6729e438bcf42c671ba91" +checksum = "c84e6fe5655adc6ce00787cf7dcaf8dc4f998a0565d23eafc207a8b08ca3349a" dependencies = [ "hashbrown 0.11.2", ] @@ -1227,16 +1190,6 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "miniz_oxide" version = "0.5.3" @@ -1246,25 +1199,6 @@ dependencies = [ "adler", ] -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", -] - [[package]] name = "mio" version = "0.8.4" @@ -1277,50 +1211,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "mio-named-pipes" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" -dependencies = [ - "log", - "mio 0.6.23", - "miow 0.3.7", - "winapi 0.3.9", -] - -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio 0.6.23", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "native-tls" version = "0.2.10" @@ -1339,17 +1229,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -1470,12 +1349,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" -dependencies = [ - "parking_lot_core", -] +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "opaque-debug" @@ -1496,7 +1372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -1565,7 +1441,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -1574,21 +1450,20 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.3.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" +checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "byteorder", - "crypto-mac 0.7.0", + "crypto-mac 0.11.1", ] [[package]] name = "pbkdf2" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "crypto-mac 0.11.1", + "digest 0.10.3", ] [[package]] @@ -1599,50 +1474,24 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" -dependencies = [ - "pin-project-internal 0.4.29", -] - -[[package]] -name = "pin-project" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" dependencies = [ - "pin-project-internal 1.0.10", + "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.29" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" +checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "pin-project-internal" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - [[package]] name = "pin-project-lite" version = "0.2.9" @@ -1832,9 +1681,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.6" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -1849,9 +1698,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.26" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "remove_dir_all" @@ -1859,20 +1708,21 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] name = "reqwest" -version = "0.10.10" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" dependencies = [ "base64 0.13.0", - "bytes 0.5.6", + "bytes", "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "hyper", @@ -1882,14 +1732,15 @@ dependencies = [ "lazy_static", "log", "mime", - "mime_guess", "native-tls", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "serde", + "serde_json", "serde_urlencoded", - "tokio 0.2.25", - "tokio-tls", + "tokio", + "tokio-native-tls", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -1986,18 +1837,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c" dependencies = [ "proc-macro2", "quote", @@ -2006,12 +1857,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "indexmap", - "itoa 1.0.2", + "itoa", "ryu", "serde", ] @@ -2034,22 +1885,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.2", + "itoa", "ryu", "serde", ] [[package]] name = "sha-1" -version = "0.9.8" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", - "digest 0.9.0", - "opaque-debug 0.3.0", + "digest 0.10.3", ] [[package]] @@ -2071,12 +1920,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] +[[package]] +name = "sha2" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.3", +] + [[package]] name = "signal-hook" version = "0.3.14" @@ -2094,7 +1954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio 0.8.4", + "mio", "signal-hook", ] @@ -2132,19 +1992,18 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "socket2" -version = "0.3.19" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ - "cfg-if 1.0.0", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2168,12 +2027,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "subtle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" - [[package]] name = "subtle" version = "2.4.1" @@ -2209,12 +2062,12 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "libc", "redox_syscall", "remove_dir_all", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2233,7 +2086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2251,6 +2104,26 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "thiserror" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "time" version = "0.1.44" @@ -2259,23 +2132,26 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "winapi", ] [[package]] name = "tiny-bip39" -version = "0.7.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" dependencies = [ - "failure", - "hmac 0.7.1", + "anyhow", + "hmac 0.12.1", "once_cell", - "pbkdf2 0.3.0", - "rand 0.7.3", + "pbkdf2 0.11.0", + "rand 0.8.5", "rustc-hash", - "sha2 0.8.2", + "sha2 0.10.2", + "thiserror", "unicode-normalization", + "wasm-bindgen", + "zeroize", ] [[package]] @@ -2295,42 +2171,29 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.2.25" +version = "1.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static", + "bytes", "libc", "memchr", - "mio 0.6.23", - "mio-named-pipes", - "mio-uds", + "mio", "num_cpus", - "pin-project-lite 0.1.12", + "once_cell", + "parking_lot", + "pin-project-lite", "signal-hook-registry", - "slab", + "socket2", "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio" -version = "1.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439" -dependencies = [ - "pin-project-lite 0.2.9", + "winapi", ] [[package]] name = "tokio-macros" -version = "0.2.6" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", @@ -2339,12 +2202,12 @@ dependencies = [ [[package]] name = "tokio-native-tls" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd608593a919a8e05a7d1fc6df885e40f6a88d3a70a3a7eff23ff27964eda069" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 0.2.25", + "tokio", ] [[package]] @@ -2353,48 +2216,48 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ - "pin-project 1.0.10", + "pin-project", "rand 0.8.5", - "tokio 1.19.2", + "tokio", ] [[package]] -name = "tokio-tls" -version = "0.3.1" +name = "tokio-stream" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" +checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" dependencies = [ - "native-tls", - "tokio 0.2.25", + "futures-core", + "pin-project-lite", + "tokio", ] [[package]] name = "tokio-tungstenite" -version = "0.11.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9e878ad426ca286e4dcae09cbd4e1973a7f8987d97570e2469703dd7f5720c" +checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" dependencies = [ "futures-util", "log", "native-tls", - "pin-project 0.4.29", - "tokio 0.2.25", + "tokio", "tokio-native-tls", "tungstenite", ] [[package]] name = "tokio-util" -version = "0.3.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ - "bytes 0.5.6", + "bytes", "futures-core", "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", + "pin-project-lite", + "tokio", + "tracing", ] [[package]] @@ -2422,7 +2285,7 @@ dependencies = [ [[package]] name = "ton_api" version = "0.2.128" -source = "git+https://github.com/tonlabs/ton-labs-tl?tag=0.2.128#fa91f87c1372048320e91d49ebba7dde52605a87" +source = "git+https://github.com/tonlabs/ton-labs-tl?tag=0.2.128#f16ff19f5dd4ccf73f65d830ab6dc782ea2127dd" dependencies = [ "byteorder", "extfmt", @@ -2445,7 +2308,7 @@ version = "1.7.51" source = "git+https://github.com/tonlabs/ton-labs-block.git?tag=1.7.51#7243ec8b0d827a6fab8ae2683cb7623d8ed2e93b" dependencies = [ "base64 0.13.0", - "crc", + "crc 1.8.1", "ed25519", "ed25519-dalek", "failure", @@ -2476,10 +2339,28 @@ dependencies = [ "ton_types", ] +[[package]] +name = "ton_block_json" +version = "0.7.19" +source = "git+https://github.com/tonlabs/ton-labs-block-json.git?tag=0.7.19#19676b6fa48a4a3c0ebf26bc5b2b3c1d8c6504b5" +dependencies = [ + "base64 0.13.0", + "failure", + "hex 0.4.3", + "num", + "num-traits", + "serde", + "serde_derive", + "serde_json", + "ton_api", + "ton_block", + "ton_types", +] + [[package]] name = "ton_client" -version = "1.34.3" -source = "git+https://github.com/tonlabs/TON-SDK.git?tag=1.34.3#ddc10c9dfc71786b8ea5c9d8d89ddbfd73869771" +version = "1.35.0" +source = "git+https://github.com/tonlabs/TON-SDK.git?tag=1.35.0#3cfcb2516aa5e64e8cb9992605838e2f90bfe789" dependencies = [ "aes", "api_derive", @@ -2492,14 +2373,13 @@ dependencies = [ "byteorder", "chacha20", "chrono", - "crc-any", + "crc 3.0.0", "ed25519-dalek", "failure", "futures", "hex 0.3.2", "hmac 0.11.0", "home", - "indexmap", "lazy_static", "libsecp256k1", "lockfree", @@ -2520,15 +2400,16 @@ dependencies = [ "sha2 0.9.9", "sodalite", "tiny-bip39", - "tokio 0.2.25", + "tokio", + "tokio-stream", "tokio-tungstenite", "ton_abi", "ton_block", - "ton_block_json", - "ton_executor", + "ton_block_json 0.7.19", + "ton_executor 1.15.74", "ton_sdk", "ton_types", - "ton_vm", + "ton_vm 1.8.39", "zeroize", "zstd", ] @@ -2543,7 +2424,20 @@ dependencies = [ "log", "ton_block", "ton_types", - "ton_vm", + "ton_vm 1.8.38", +] + +[[package]] +name = "ton_executor" +version = "1.15.74" +source = "git+https://github.com/tonlabs/ton-labs-executor.git?tag=1.15.74#910159dd53c62637777ee9f21b6d2b5ed2a8e4ab" +dependencies = [ + "failure", + "lazy_static", + "log", + "ton_block", + "ton_types", + "ton_vm 1.8.39", ] [[package]] @@ -2563,14 +2457,13 @@ dependencies = [ [[package]] name = "ton_sdk" -version = "1.34.3" -source = "git+https://github.com/tonlabs/TON-SDK.git?tag=1.34.3#ddc10c9dfc71786b8ea5c9d8d89ddbfd73869771" +version = "1.35.0" +source = "git+https://github.com/tonlabs/TON-SDK.git?tag=1.35.0#3cfcb2516aa5e64e8cb9992605838e2f90bfe789" dependencies = [ "api_derive", "api_info", "base64 0.10.1", "chrono", - "crc-any", "ed25519-dalek", "failure", "hex 0.3.2", @@ -2581,19 +2474,19 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha2 0.8.2", + "sha2 0.9.9", "ton_abi", "ton_block", "ton_types", - "ton_vm", + "ton_vm 1.8.39", ] [[package]] name = "ton_tl_codegen" version = "0.0.2" -source = "git+https://github.com/tonlabs/ton-labs-tl?tag=0.2.128#fa91f87c1372048320e91d49ebba7dde52605a87" +source = "git+https://github.com/tonlabs/ton-labs-tl?tag=0.2.128#f16ff19f5dd4ccf73f65d830ab6dc782ea2127dd" dependencies = [ - "crc", + "crc 1.8.1", "failure", "pom", "proc-macro2", @@ -2606,10 +2499,10 @@ dependencies = [ [[package]] name = "ton_types" version = "1.11.2" -source = "git+https://github.com/tonlabs/ton-labs-types.git?tag=1.11.2#1e8fab540649d4b0fe3713be64fa01ca73d2b9fe" +source = "git+https://github.com/tonlabs/ton-labs-types.git?tag=1.11.2#0fb6b9cfacc84a3974dcb0aa674335fcf74de7ee" dependencies = [ "base64 0.13.0", - "crc", + "crc 1.8.1", "failure", "hex 0.4.3", "lazy_static", @@ -2642,9 +2535,28 @@ dependencies = [ "ton_types", ] +[[package]] +name = "ton_vm" +version = "1.8.39" +source = "git+https://github.com/tonlabs/ton-labs-vm.git?tag=1.8.39#b75d857c8d6c4f94be44abb3d3ae97cf7c027059" +dependencies = [ + "ed25519", + "ed25519-dalek", + "failure", + "hex 0.4.3", + "lazy_static", + "log", + "num", + "num-traits", + "rand 0.7.3", + "sha2 0.9.9", + "ton_block", + "ton_types", +] + [[package]] name = "tonos-cli" -version = "0.26.44" +version = "0.27.1" dependencies = [ "assert_cmd", "async-trait", @@ -2671,17 +2583,17 @@ dependencies = [ "sha2 0.8.2", "simplelog", "string-error", - "tokio 0.2.25", + "tokio", "tokio-retry", "ton_abi", "ton_block", - "ton_block_json", + "ton_block_json 0.7.18", "ton_client", - "ton_executor", + "ton_executor 1.15.72", "ton_labs_assembler", "ton_sdk", "ton_types", - "ton_vm", + "ton_vm 1.8.38", ] [[package]] @@ -2696,9 +2608,8 @@ version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ - "cfg-if 1.0.0", - "log", - "pin-project-lite 0.2.9", + "cfg-if", + "pin-project-lite", "tracing-core", ] @@ -2711,16 +2622,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project 1.0.10", - "tracing", -] - [[package]] name = "try-lock" version = "0.2.3" @@ -2729,20 +2630,20 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tungstenite" -version = "0.11.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23" +checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" dependencies = [ - "base64 0.12.3", + "base64 0.13.0", "byteorder", - "bytes 0.5.6", + "bytes", "http", "httparse", - "input_buffer", "log", "native-tls", - "rand 0.7.3", + "rand 0.8.5", "sha-1", + "thiserror", "url", "utf-8", ] @@ -2753,15 +2654,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.8" @@ -2776,9 +2668,9 @@ checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "unicode-normalization" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dee68f85cab8cf68dec42158baf3a79a1cdc065a8b103025965d6ccb7f6cbd" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ "tinyvec", ] @@ -2874,9 +2766,7 @@ version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" dependencies = [ - "cfg-if 1.0.0", - "serde", - "serde_json", + "cfg-if", "wasm-bindgen-macro", ] @@ -2901,7 +2791,7 @@ version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -2946,12 +2836,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -2962,12 +2846,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -2980,7 +2858,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3034,28 +2912,18 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "winapi", ] [[package]] name = "zeroize" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07" +checksum = "20b578acffd8516a6c3f2a1bdefc1ec37e547bb4e0fb8b6b01a4cafc886b4442" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 55bbbb4b..20a8f4cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ license = 'Apache-2.0' name = 'tonos-cli' readme = 'README.md' repository = 'https://github.com/tonlabs/tonos-cli' -version = '0.26.52' +version = '0.27.1' [dependencies] async-trait = '0.1.42' diff --git a/README.md b/README.md index 5c915440..ddd9e852 100644 --- a/README.md +++ b/README.md @@ -46,10 +46,9 @@ tonos-cli -h - [4.3. Get contract status](#43-get-contract-status) - [4.4. Call method](#44-call-method) - [4.4.1. Call contract on the blockchain](#441-call-contract-on-the-blockchain) - - [4.4.2. Alternative command to call contract in the blockchain](#442-alternative-command-to-call-contract-in-the-blockchain) - - [4.4.3. Run contract method locally](#443-run-contract-method-locally) - - [4.4.4. Run funC get-method](#444-run-func-get-method) - - [4.4.5. Run contract method locally for saved account BOC](#445-run-contract-method-locally-for-saved-account-boc) + - [4.4.2. Run contract method locally](#442-run-contract-method-locally) + - [4.4.3. Run funC get-method](#443-run-func-get-method) + - [4.4.4. Run contract method locally for saved account BOC](#444-run-contract-method-locally-for-saved-account-boc) - [4.5. Generate encrypted message offline](#45-generate-encrypted-message-offline) - [4.6. Broadcast previously generated message](#46-broadcast-previously-generated-message) - [4.7. Broadcast previously generated message from a file](#47-broadcast-previously-generated-message-from-a-file) @@ -87,16 +86,13 @@ tonos-cli -h - [8.2. Vote for proposal](#82-vote-for-proposal) - [8.3. Decode proposal comment](#83-decode-proposal-comment) - [9. Supplementary commands](#9-supplementary-commands) - - [9.1. Convert tokens to nanotokens](#91-convert-tokens-to-nanotokens) - - [9.2. Get global config](#92-get-global-config) - - [9.3. NodeID](#93-nodeid) - - [9.4. Dump blockchain config](#94-dump-blockchain-config) - - [9.5. Dump several account states](#95-dump-several-account-states) - - [9.6. Update global config parameter](#96-update-global-config-parameter) - - [9.7. Wait for account change](#96-account-wait) - - [9.8. Make a raw GraphQL query](#97-query-raw) - - [9.9. Wait for account change](#96-wait-for-account-change) - - [9.10. Make a raw GraphQL query](#97-make-a-raw-graphql-query) + - [9.1. Get global config](#91-get-global-config) + - [9.2. NodeID](#92-nodeid) + - [9.3. Dump blockchain config](#93-dump-blockchain-config) + - [9.4. Dump several account states](#94-dump-several-account-states) + - [9.5. Update global config parameter](#95-update-global-config-parameter) + - [9.6. Wait for an account change](#96-wait-for-an-account-change) + - [9.7 Make a raw GraphQL query](#97-make-a-raw-graphql-query) - [10. Fetch and replay](#10-fetch-and-replay) - [10.1. How to unfreeze account](#101-how-to-unfreeze-account) - [11. Debug commands](#11-debug-commands) @@ -886,64 +882,7 @@ Result: { **Note**: If your function is marked as [responsible](https://github.com/tonlabs/TON-Solidity-Compiler/blob/master/API.md#external-function-calls), TONOS-CLI expects `_answer_id` field, and you may encounter errors, if it's missing. -### 4.4.2. Alternative command to call contract in the blockchain - -```bash -tonos-cli callex [
] [] [] params... -``` - -**Note:** this command is deprecated, use [`callx`](#410-alternative-syntax-for-call-deploy-and-run-commands) instead. - -`` - the method being called. - -`
` - contract [address](#41-generate-contract-address). - -`` - contract interface file. - -`` - can either be the seed phrase or the corresponding key pair file. If seed phrase is used, enclose it in double quotes. - -Example: - -- `--sign "flip uncover dish sense hazard smile gun mom vehicle chapter order enact"` - -or - -- `--sign keyfile.json` - -`params...` - one or more parameters of the called method in the form of `--name value`. - -`address`, `abi`, and `keys` parameters can be omitted. In this case default values will be used from config file. - -Integer and address types can be supplied without quotes. - -- `--value 1.5T` - suffix `T` converts integer to nanotokens -> `1500000000`. The same as `--value 1500000000`. - -Arrays can be used without `[]` brackets. - -Example of transaction creation in a [multisignature wallet](https://github.com/tonlabs/ton-labs-contracts/tree/master/solidity/safemultisig) contract, equivalent to the example in section 4.4.1. above: - -```bash -$ tonos-cli callex submitTransaction 0:a4629d617df931d8ad86ed24f4cac3d321788ba082574144f5820f2894493fbc SetcodeMultisigWallet.abi.json k1.keys.json --dest -1:0c5d5215317ec8eef1b84c43cbf08523c33f69677365de88fe3d96a0b31b59c6 --value 0.234T --bounce false --allBalance false --payload "" -Config: /home/user/tonos-cli.conf.json -Input arguments: - address: 0:a4629d617df931d8ad86ed24f4cac3d321788ba082574144f5820f2894493fbc - method: submitTransaction - params: {"dest":"-1:0c5d5215317ec8eef1b84c43cbf08523c33f69677365de88fe3d96a0b31b59c6","value":"0234000000","bounce":"false","allBalance":"false","payload":""} - abi: SetcodeMultisigWallet.abi.json - keys: k1.keys.json -Connecting to net.ton.dev -Generating external inbound message... - -MessageId: a38f37bfbe3c7427c869b3ee97c3b2d7f4421ca1427ace4e7a92f1a61d7ef234 -Expire at: Sat, 08 May 2021 15:10:15 +0300 -Processing... -Succeeded. -Result: { - "transId": "6959890394123980993" -} -``` - -### 4.4.3. Run contract method locally +### 4.4.2. Run contract method locally ```bash tonos-cli run [--abi ]
@@ -999,7 +938,7 @@ Result: { } ``` -### 4.4.4. Run funC get-method +### 4.4.3. Run funC get-method ```bash tonos-cli runget [--boc] [--tvc]
[...] [--bc_config ] @@ -1056,7 +995,7 @@ Result: ["125387107580525"] -### 4.4.5. Run contract method locally for saved account BOC +### 4.4.4. Run contract method locally for saved account BOC ```bash tonos-cli run [--boc] [--tvc] [--abi ] [--bc_config ] @@ -2200,23 +2139,7 @@ tonos-cli proposal decode # 9. Supplementary commands -## 9.1. Convert tokens to nanotokens - -Transaction amounts in `tonos-cli` are indicated in nanotokens. To convert tokens to nanotokens use the following command: - -```bash -tonos-cli convert tokens -``` - -Example: - -```bash -$ tonos-cli convert tokens 125.8 -Config: /home/user/tonos-cli.conf.json -125800000000 -``` - -## 9.2. Get global config +## 9.1. Get global config ```bash tonos-cli getconfig @@ -2239,7 +2162,7 @@ Config p16: { } ``` -## 9.3. NodeID +## 9.2. NodeID The following command calculates node ID from validator public key: @@ -2262,7 +2185,7 @@ Input arguments: 50232655f2ad44f026b03ec1834ae8316bfa1f3533732da1e19b3b31c0f04143 ``` -## 9.4. Dump blockchain config +## 9.3. Dump blockchain config ```bash tonos-cli dump config @@ -2281,7 +2204,7 @@ Connecting to main.ton.dev Config successfully saved to config.boc ``` -## 9.5. Dump several account states +## 9.4. Dump several account states Dumps the list of accounts. Files will have address without workchain id as a name. @@ -2311,7 +2234,7 @@ Processing... Succeeded. ``` -## 9.6. Update global config parameter +## 9.5. Update global config parameter Use the following command to update one parameter of global config, that is stored in a .json file: @@ -2350,7 +2273,7 @@ Message: b5ee9c720101020100850001e589feaaaaaaaaaaaaa... ``` -## 9.7. Wait for an account change +## 9.6. Wait for an account change The command `account-wait` waits for the change of the `last_trans_lt` account field. It exits with zero exit code upon success (the field has changed before timeout). Otherwise, it exits with non-zero code. @@ -2372,7 +2295,7 @@ $ echo $? 0 ``` -## 9.8. Make a raw GraphQL query +## 9.7. Make a raw GraphQL query The command `query-raw` executes a raw network query by directly calling the `ton_client::net::query_collection` SDK interface. diff --git a/src/main.rs b/src/main.rs index 5b079b75..2c374d6e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -144,23 +144,6 @@ async fn main() -> Result<(), i32> { async fn main_internal() -> Result <(), String> { let version_string = env!("CARGO_PKG_VERSION").to_string(); - let callex_cmd = SubCommand::with_name("callex") - .about("Sends an external message with encoded function call to the contract (alternative syntax). Deprecated use `callx` instead.") - .setting(AppSettings::AllowMissingPositional) - .setting(AppSettings::AllowLeadingHyphen) - .setting(AppSettings::TrailingVarArg) - .setting(AppSettings::DontCollapseArgsInUsage) - .arg(Arg::with_name("METHOD") - .help("Name of the function being called.")) - .arg(Arg::with_name("ADDRESS") - .help("Contract address.")) - .arg(Arg::with_name("ABI") - .help("Path to the contract ABI file.")) - .arg(Arg::with_name("SIGN") - .help("Seed phrase or path to the file with keypair used to sign the message.")) - .arg(Arg::with_name("PARAMS") - .help("Function arguments. Must be a list of `--name value` pairs or a json string with all arguments.") - .multiple(true)); let abi_arg = Arg::with_name("ABI") .long("--abi") @@ -292,15 +275,6 @@ async fn main_internal() -> Result <(), String> { let version_cmd = SubCommand::with_name("version") .about("Prints build and version info."); - let convert_cmd = SubCommand::with_name("convert") - .about("Converts tokens to nanotokens.") - .subcommand(SubCommand::with_name("tokens") - .about("Converts tokens to nanotokens.") - .arg(Arg::with_name("AMOUNT") - .takes_value(true) - .required(true) - .help("Token amount value"))); - let genphrase_cmd = SubCommand::with_name("genphrase") .about("Generates a seed phrase for keypair.") .author("TONLabs") @@ -888,14 +862,12 @@ async fn main_internal() -> Result <(), String> { .short("-j") .long("--json")) .subcommand(version_cmd) - .subcommand(convert_cmd) .subcommand(genphrase_cmd) .subcommand(genpubkey_cmd) .subcommand(getkeypair_cmd) .subcommand(genaddr_cmd) .subcommand(deploy_cmd) .subcommand(deploy_message_cmd) - .subcommand(callex_cmd) .subcommand(call_cmd) .subcommand(send_cmd) .subcommand(message_cmd) @@ -978,14 +950,6 @@ async fn command_parser(matches: &ArgMatches<'_>, is_json: bool) -> Result <(), config.endpoints = FullConfig::get_map(&config_file).get(url).unwrap_or(&empty).clone(); } - if let Some(m) = matches.subcommand_matches("convert") { - if let Some(m) = m.subcommand_matches("tokens") { - return convert_tokens(m, &config); - } - } - if let Some(m) = matches.subcommand_matches("callex") { - return callex_command(m, &config).await; - } if let Some(m) = matches.subcommand_matches("callx") { return callx_command(m, &config, CallType::Call).await; } @@ -1133,19 +1097,6 @@ async fn command_parser(matches: &ArgMatches<'_>, is_json: bool) -> Result <(), Err("invalid arguments".to_string()) } -fn convert_tokens(matches: &ArgMatches, config: &Config) -> Result<(), String> { - let amount = matches.value_of("AMOUNT").unwrap(); - let result = convert::convert_token(amount)?; - if config.is_json { - let result = json!({"value": result}); - println!("{}", serde_json::to_string_pretty(&result) - .unwrap_or("Failed to serialize the result".to_string())); - } else { - println!("{}", result); - } - Ok(()) -} - fn genphrase_command(matches: &ArgMatches, config: &Config) -> Result<(), String> { generate_mnemonic(matches.value_of("DUMP_KEYPAIR"), config) } @@ -1339,44 +1290,6 @@ async fn callx_command(matches: &ArgMatches<'_>, config: &Config, call_type: Cal ).await } -async fn callex_command(matches: &ArgMatches<'_>, config: &Config) -> Result<(), String> { - let method_opt = matches.value_of("METHOD"); - let method = method_opt.ok_or("METHOD is not defined")?; - let address = Some( - matches.value_of("ADDRESS") - .map(|s| s.to_string()) - .or(config.addr.clone()) - .ok_or("ADDRESS is not defined. Supply it in the config file or in command line.".to_string())? - ); - let abi = Some(abi_from_matches_or_config(matches, &config)?); - let loaded_abi = std::fs::read_to_string(abi.as_ref().unwrap()) - .map_err(|e| format!("failed to read ABI file: {}", e))?; - let params = matches.values_of("PARAMS").ok_or("PARAMS is not defined")?; - let params = Some(parse_params( - params.collect::>(), &loaded_abi, method_opt.unwrap() - )?); - let keys = matches.value_of("SIGN") - .map(|s| s.to_string()) - .or(config.keys_path.clone()); - - if !config.is_json { - print_args!(address, method_opt, params, abi, keys); - } - - let address = load_ton_address(address.unwrap().as_str(), &config)?; - - call_contract( - config, - address.as_str(), - loaded_abi, - method, - ¶ms.unwrap(), - keys, - false, - Some(matches), - ).await -} - async fn runget_command(matches: &ArgMatches<'_>, config: &Config) -> Result<(), String> { let address = matches.value_of("ADDRESS"); let method = matches.value_of("METHOD"); diff --git a/tests/json_output_test.rs b/tests/json_output_test.rs index 90530041..9c68d1dd 100644 --- a/tests/json_output_test.rs +++ b/tests/json_output_test.rs @@ -44,7 +44,6 @@ fn test_json_output_1() -> Result<(), Box> { run_command_and_decode_json(&format!("account {}", GIVER_V2_ADDR))?; run_command_and_decode_json(&format!("body --abi {} addOrdinaryStake {{\"stake\":65535}}", DEPOOL_ABI))?; run_command_and_decode_json(&format!("call {} sendGrams {{\"dest\":\"{}\",\"amount\":1111111}} --abi {}", GIVER_ADDR, GIVER_ADDR, GIVER_ABI))?; - run_command_and_decode_json(&format!("callex sendGrams {} {} --dest {} --amount 123464", GIVER_ADDR, GIVER_ABI, GIVER_ADDR))?; run_command_and_decode_json(&format!("callx --addr {} sendGrams --dest {} --amount 1111111 --abi {}", GIVER_ADDR, GIVER_ADDR, GIVER_ABI))?; run_command_and_decode_json(r#"config endpoint add randomurl randomendpoint"#)?; run_command_and_decode_json(r#"config endpoint print"#)?; @@ -120,7 +119,6 @@ fn test_json_output_4() -> Result<(), Box> { run_command_and_decode_json(&format!("body --abi {} addOrdinaryStake {{\"stake1\":65535}}", DEPOOL_ABI))?; run_command_and_decode_json("convert tokens 0.12345678a")?; run_command_and_decode_json(&format!("call 0:841288ed3b55d9cdafa806807f02a0ae0c169aa5edfe88a789a6482429756a95 sendGrams {{\"dest\":\"0:841288ed3b55d9cdafa806807f02a0ae0c169aa5edfe88a789a6482429756a94\",\"amount\":1111111}} --abi {}", GIVER_ABI))?; - run_command_and_decode_json(&format!("callex sendGrams 0:841288ed3b55d9cdafa806807f02a0ae0c169aa5edfe88a789a6482429756a95 {} {} --dest 0:841288ed3b55d9cdafa806807f02a0ae0c169aa5edfe88a789a6482429756a94 --amount 123464", GIVER_ABI, GIVER_V2_KEY))?; run_command_and_decode_json(&format!("callx --addr 0:841288ed3b55d9cdafa806807f02a0ae0c169aa5edfe88a789a6482429756a95 sendGrams --dest 0:841288ed3b55d9cdafa806807f02a0ae0c169aa5edfe88a789a6482429756a94 --amount 1111111 --abi {}", GIVER_ABI))?; run_command_and_decode_json(r#"config endpoint remove random"#)?; run_command_and_decode_json(&format!("decode msg tests/samples/wallet.boc --abi {}", DEPOOL_ABI))?; diff --git a/tests/mnemonic.rs b/tests/mnemonic.rs index 66e0c437..531940f6 100644 --- a/tests/mnemonic.rs +++ b/tests/mnemonic.rs @@ -52,10 +52,14 @@ fn test_has_mnemonic_checks() -> Result<(), Box> { .stdout(predicate::str::contains(WRONG_SEED_ERROR_TEXT)); let mut cmd = Command::cargo_bin(BIN_NAME)?; - cmd.arg("callex") + cmd.arg("callx") + .arg("-m") .arg("sendTransaction") + .arg("--addr") .arg("0:2bb4a0e8391e7ea8877f4825064924bd41ce110fce97e939d3323999e1efbb13") + .arg("--abi") .arg("./tests/samples/wallet.abi.json") + .arg("--keys") .arg(WRONG_SEED) .arg("--dest") .arg("0:841288ed3b55d9cdafa806807f02a0ae0c169aa5edfe88a789a6482429756a94") diff --git a/tests/test_cli.rs b/tests/test_cli.rs index 4cd8ac66..92c6c911 100644 --- a/tests/test_cli.rs +++ b/tests/test_cli.rs @@ -660,66 +660,6 @@ fn test_genaddr_seed() -> Result<(), Box> { Ok(()) } -#[test] -fn test_callex() -> Result<(), Box> { - let mut cmd = Command::cargo_bin(BIN_NAME)?; - cmd.arg("callex") - .arg("sendTransaction") - .arg(GIVER_V2_ADDR) - .arg(GIVER_V2_ABI) - .arg(GIVER_V2_KEY) - .arg("--dest") - .arg("0:1b91c010f35b1f5b42a05ad98eb2df80c302c37df69651e1f5ac9c69b7e90d4e") - .arg("--value") - .arg("0.2T") - .arg("--bounce") - .arg("false"); - cmd.assert() - .success() - .stdout(predicate::str::contains(r#""dest":"0:1b91c010f35b1f5b42a05ad98eb2df80c302c37df69651e1f5ac9c69b7e90d4e""#)) - .stdout(predicate::str::contains(r#""value":"200000000""#)) - .stdout(predicate::str::contains("Succeeded")); - - - let mut cmd = Command::cargo_bin(BIN_NAME)?; - cmd.arg("callex") - .arg("sendTransaction") - .arg(GIVER_V2_ADDR) - .arg(GIVER_V2_ABI) - .arg(GIVER_V2_KEY) - .arg("--dest") - .arg("0:1b91c010f35b1f5b42a05ad98eb2df80c302c37df69651e1f5ac9c69b7e90d4e") - .arg("--value") - .arg("1000000000") - .arg("--bounce") - .arg("false"); - cmd.assert() - .success() - .stdout(predicate::str::contains(r#""dest":"0:1b91c010f35b1f5b42a05ad98eb2df80c302c37df69651e1f5ac9c69b7e90d4e""#)) - .stdout(predicate::str::contains(r#""value":"1000000000""#)) - .stdout(predicate::str::contains("Succeeded")); - - let mut cmd = Command::cargo_bin(BIN_NAME)?; - cmd.arg("callex") - .arg("sendTransaction") - .arg(GIVER_V2_ADDR) - .arg(GIVER_V2_ABI) - .arg(GIVER_V2_KEY) - .arg("--dest") - .arg("0:1b91c010f35b1f5b42a05ad98eb2df80c302c37df69651e1f5ac9c69b7e90d4e") - .arg("--value") - .arg("0x10000") - .arg("--bounce") - .arg("false"); - cmd.assert() - .success() - .stdout(predicate::str::contains(r#""dest":"0:1b91c010f35b1f5b42a05ad98eb2df80c302c37df69651e1f5ac9c69b7e90d4e""#)) - .stdout(predicate::str::contains(r#""value":"0x10000""#)) - .stdout(predicate::str::contains("Succeeded")); - - Ok(()) -} - #[test] fn test_nodeid() -> Result<(), Box> { let mut cmd = Command::cargo_bin(BIN_NAME)?; @@ -2266,41 +2206,3 @@ fn test_alternative_syntax() -> Result<(), Box> { Ok(()) } - -#[test] -fn test_convert() -> Result<(), Box> { - let mut cmd = Command::cargo_bin(BIN_NAME)?; - cmd.arg("convert") - .arg("tokens") - .arg("0.1234567890") - .output() - .expect("Error: invalid fractional part"); - - let mut cmd = Command::cargo_bin(BIN_NAME)?; - cmd.arg("convert") - .arg("tokens") - .arg("0.123456789") - .assert() - .success() - .stdout(predicate::str::contains("123456789")); - - - let mut cmd = Command::cargo_bin(BIN_NAME)?; - cmd.arg("convert") - .arg("tokens") - .arg("0.01") - .assert() - .success() - .stdout(predicate::str::contains("10000000")); - - let mut cmd = Command::cargo_bin(BIN_NAME)?; - cmd.arg("-j") - .arg("convert") - .arg("tokens") - .arg("0.123456789") - .assert() - .success() - .stdout(predicate::str::contains(r#""value": "123456789""#)); - - Ok(()) -}