From 4860983b8d236820630b3e98cba2e005eb8911c8 Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Tue, 5 Sep 2023 11:40:41 +0300 Subject: [PATCH 1/7] Version 1.44.3 --- 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 6c066849..bf2780bf 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.2' +version = '1.44.3' [dependencies] quote = '1.0.26' diff --git a/api/info/Cargo.toml b/api/info/Cargo.toml index b3958047..d239f55f 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.2' +version = '1.44.3' [dependencies] serde = '1.0.115' diff --git a/api/test/Cargo.toml b/api/test/Cargo.toml index fa6fcbd6..6d60befb 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.2' +version = '1.44.3' [dependencies] serde = '1.0.115' diff --git a/ton_client/Cargo.toml b/ton_client/Cargo.toml index 53712edd..28adf88e 100644 --- a/ton_client/Cargo.toml +++ b/ton_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'ton_client' -version = '1.44.2' +version = '1.44.3' 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 2be41a8a..4315aa71 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.2' +version = '1.44.3' authors = [ 'TON Labs LTD ' ] edition = '2018' license = 'Apache-2.0' diff --git a/ton_sdk/Cargo.toml b/ton_sdk/Cargo.toml index 32955cb3..96f0a3fe 100644 --- a/ton_sdk/Cargo.toml +++ b/ton_sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'ton_sdk' -version = '1.44.2' +version = '1.44.3' edition = '2018' license = 'Apache-2.0' authors = [ 'TON Labs LTD ' ] diff --git a/toncli/Cargo.toml b/toncli/Cargo.toml index a10d333c..f7b34476 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.2' +version = '1.44.3' [dependencies] base64 = '0.13.0' From f6b4d7f0e61dfb02cd8999103db67713984e096b Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Tue, 5 Sep 2023 16:40:54 +0300 Subject: [PATCH 2/7] Return network params resolving error --- CHANGELOG.md | 6 ++++++ Cargo.lock | 14 +++++++------- ton_client/src/net/network_params.rs | 4 +--- ton_client/src/tvm/tests.rs | 15 ++++++++------- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67775755..efcdd159 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [1.44.3] – 2023-09-05 + +### New + +- Error appeared during network paramaters resolving is returned to client instead of using default parameters + ## [1.44.2] – 2023-08-22 ### New diff --git a/Cargo.lock b/Cargo.lock index 2d517c78..560e3784 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,7 +113,7 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "api_derive" -version = "1.44.2" +version = "1.44.3" dependencies = [ "api_info", "proc-macro2", @@ -124,7 +124,7 @@ dependencies = [ [[package]] name = "api_info" -version = "1.44.2" +version = "1.44.3" dependencies = [ "serde", "serde_derive", @@ -133,7 +133,7 @@ dependencies = [ [[package]] name = "api_test" -version = "1.44.2" +version = "1.44.3" dependencies = [ "api_derive", "api_info", @@ -2604,7 +2604,7 @@ dependencies = [ [[package]] name = "ton_client" -version = "1.44.2" +version = "1.44.3" dependencies = [ "aes", "api_derive", @@ -2671,7 +2671,7 @@ dependencies = [ [[package]] name = "ton_client_processing" -version = "1.44.2" +version = "1.44.3" dependencies = [ "api_derive", "api_info", @@ -2703,7 +2703,7 @@ dependencies = [ [[package]] name = "ton_sdk" -version = "1.44.2" +version = "1.44.3" dependencies = [ "api_derive", "api_info", @@ -2810,7 +2810,7 @@ dependencies = [ [[package]] name = "toncli" -version = "1.44.2" +version = "1.44.3" dependencies = [ "api_info", "assert_cmd", diff --git a/ton_client/src/net/network_params.rs b/ton_client/src/net/network_params.rs index 68fc4f45..da6e7a98 100644 --- a/ton_client/src/net/network_params.rs +++ b/ton_client/src/net/network_params.rs @@ -63,9 +63,7 @@ pub(crate) async fn get_default_params(context: &Arc) -> ClientRe } let (config, global_id) = if let Ok(link) = context.get_server_link() { - query_network_params(link) - .await - .unwrap_or_else(|_| offline_config()) + query_network_params(link).await? } else { offline_config() }; diff --git a/ton_client/src/tvm/tests.rs b/ton_client/src/tvm/tests.rs index 206c0e6d..43ac6970 100644 --- a/ton_client/src/tvm/tests.rs +++ b/ton_client/src/tvm/tests.rs @@ -844,13 +844,9 @@ async fn test_method_error( #[tokio::test(flavor = "multi_thread", worker_threads = 2)] async fn test_resolve_blockchain_config() { - if TestClient::node_se() { - return; - } - - let mut config = crate::ClientConfig::default(); - config.network.endpoints = Some(TestClient::endpoints()); - let net_context = Arc::new(crate::ClientContext::new(config).unwrap()); + let mut client_config = crate::ClientConfig::default(); + client_config.network.endpoints = Some(TestClient::endpoints()); + let net_context = Arc::new(crate::ClientContext::new(client_config.clone()).unwrap()); let local_context = Arc::new(crate::ClientContext::new(crate::ClientConfig::default()).unwrap()); @@ -871,6 +867,11 @@ async fn test_resolve_blockchain_config() { let config = resolve_network_params(&net_context, None, None).await.unwrap().blockchain_config; assert_ne!(config.raw_config(), offline_config().0.raw_config()); + + client_config.network.endpoints = Some(vec!["-1".to_owned()]); + client_config.network.max_reconnect_timeout = 1; + let wrong_net_context = Arc::new(crate::ClientContext::new(client_config.clone()).unwrap()); + assert!(resolve_network_params(&wrong_net_context, None, None).await.is_err()); } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] From 1bfa12328c71916f0feac195399ff30f26485639 Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Wed, 6 Sep 2023 11:10:08 +0300 Subject: [PATCH 3/7] Block proof is public --- ton_client/src/proofs/mod.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ton_client/src/proofs/mod.rs b/ton_client/src/proofs/mod.rs index e12e82f3..118ef9ca 100644 --- a/ton_client/src/proofs/mod.rs +++ b/ton_client/src/proofs/mod.rs @@ -505,7 +505,7 @@ impl Signatures { } } -pub(crate) struct BlockProof { +pub struct BlockProof { id: BlockIdExt, root: Cell, signatures: Signatures, @@ -552,7 +552,6 @@ impl BlockProof { Ok(Self { id, root, signatures }) } - #[cfg(test)] pub fn deserialize(data: &[u8]) -> Result { let proof = ton_block::BlockProof::construct_from_bytes(data)?; let signatures = proof.signatures @@ -960,7 +959,7 @@ async fn resolve_initial_trusted_key_block( } #[async_trait::async_trait] -pub(crate) trait ProofHelperEngine { +pub trait ProofHelperEngine { async fn load_zerostate(&self) -> Result; async fn load_key_block_proof(&self, mc_seq_no: u32) -> Result; } From 8207d82cc3c0463adca17d23ef8cf839a026e111 Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Wed, 6 Sep 2023 14:17:25 +0300 Subject: [PATCH 4/7] Update dependencies --- Cargo.lock | 400 ++++++++++++++++++++----------- ton_client/Cargo.toml | 14 +- ton_client/src/tvm/call_tvm.rs | 2 +- ton_client_processing/Cargo.toml | 4 +- ton_sdk/Cargo.toml | 6 +- 5 files changed, 278 insertions(+), 148 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 560e3784..5d305ada 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -74,9 +74,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -182,7 +182,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -193,9 +193,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -235,9 +235,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bincode" @@ -362,9 +368,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" dependencies = [ "android-tzdata", "iana-time-zone", @@ -372,7 +378,7 @@ dependencies = [ "num-traits", "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -406,6 +412,12 @@ dependencies = [ "unreachable", ] +[[package]] +name = "const-oid" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + [[package]] name = "cookie" version = "0.16.2" @@ -413,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.26", + "time 0.3.28", "version_check", ] @@ -430,7 +442,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "time 0.3.26", + "time 0.3.28", "url", ] @@ -530,9 +542,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", @@ -541,6 +553,44 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "platforms", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "deranged" version = "0.3.8" @@ -652,7 +702,17 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature", + "signature 1.6.4", +] + +[[package]] +name = "ed25519" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +dependencies = [ + "pkcs8", + "signature 2.1.0", ] [[package]] @@ -661,14 +721,28 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", - "ed25519", + "curve25519-dalek 3.2.0", + "ed25519 1.5.3", "rand 0.7.3", "serde", "sha2 0.9.9", "zeroize", ] +[[package]] +name = "ed25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +dependencies = [ + "curve25519-dalek 4.1.0", + "ed25519 2.2.2", + "rand_core 0.6.4", + "serde", + "sha2 0.10.7", + "zeroize", +] + [[package]] name = "either" version = "1.9.0" @@ -677,9 +751,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if 1.0.0", ] @@ -692,9 +766,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -713,14 +787,14 @@ dependencies = [ [[package]] name = "ever-struct" -version = "1.0.2" -source = "git+https://github.com/tonlabs/ever-struct.git?tag=1.0.2#02b2a4ea4b6b86e1ff6168baad4a5fffbe3ab5e7" +version = "1.0.4" +source = "git+https://github.com/tonlabs/ever-struct.git?tag=1.0.6#5e235596129424affed9b0eb4cda94f9d03f1ce0" dependencies = [ "anyhow", "failure", "hex-literal", "ton_block", - "ton_types 2.0.18", + "ton_types 2.0.25", ] [[package]] @@ -757,6 +831,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +[[package]] +name = "fiat-crypto" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" + [[package]] name = "float-cmp" version = "0.8.0" @@ -852,7 +932,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -923,9 +1003,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "graphql-parser" @@ -1404,9 +1484,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "mime" @@ -1474,9 +1554,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1557,9 +1637,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -1578,11 +1658,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.56" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -1599,7 +1679,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -1610,9 +1690,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -1684,19 +1764,20 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.2" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" +checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.7.2" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" +checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" dependencies = [ "pest", "pest_generator", @@ -1704,22 +1785,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.2" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" +checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] name = "pest_meta" -version = "2.7.2" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" +checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" dependencies = [ "once_cell", "pest", @@ -1728,9 +1809,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1738,12 +1819,28 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "platforms" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" + [[package]] name = "pom" version = "1.1.0" @@ -1942,13 +2039,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", + "regex-automata 0.3.8", "regex-syntax", ] @@ -1960,9 +2057,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -1971,17 +2068,17 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "bytes", "cookie", "cookie_store", @@ -2026,11 +2123,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ "bitflags 2.4.0", "errno", @@ -2113,11 +2219,17 @@ dependencies = [ "libc", ] +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + [[package]] name = "serde" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -2134,13 +2246,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2163,7 +2275,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2231,6 +2343,12 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +[[package]] +name = "signature" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" + [[package]] name = "similar" version = "2.2.1" @@ -2242,9 +2360,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -2284,6 +2402,16 @@ dependencies = [ "rand 0.7.3", ] +[[package]] +name = "spki" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "subtle" version = "2.4.1" @@ -2303,9 +2431,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -2345,22 +2473,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2387,9 +2515,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.26" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -2406,9 +2534,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -2472,7 +2600,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] @@ -2526,14 +2654,14 @@ dependencies = [ [[package]] name = "ton_abi" -version = "2.3.131" -source = "git+https://github.com/tonlabs/ever-abi.git?tag=2.3.131#4cc96f046abee55b28678226c533e3bd66885a24" +version = "2.3.141" +source = "git+https://github.com/tonlabs/ever-abi.git?tag=2.3.141#346c264ebdff7e0cbe3e177e2994446fcf09c186" dependencies = [ "base64 0.10.1", "byteorder", "chrono", - "ed25519", - "ed25519-dalek", + "ed25519 1.5.3", + "ed25519-dalek 1.0.1", "failure", "hex 0.3.2", "num-bigint", @@ -2543,13 +2671,13 @@ dependencies = [ "serde_json", "sha2 0.10.7", "ton_block", - "ton_types 2.0.18", + "ton_types 2.0.25", ] [[package]] name = "ton_api" -version = "0.3.25" -source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.25#67be17a07799e2c0d61d07eaf104f7c0c4bb7006" +version = "0.3.36" +source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.36#07d4f74698ffaa9030cf77eee1c816e73ea46272" dependencies = [ "byteorder", "extfmt", @@ -2563,31 +2691,31 @@ dependencies = [ "serde_json", "ton_block", "ton_tl_codegen", - "ton_types 2.0.18", + "ton_types 2.0.25", ] [[package]] name = "ton_block" -version = "1.9.89" -source = "git+https://github.com/tonlabs/ever-block.git?tag=1.9.89#2d80268af9c81addd89e32cdc0bab28789316ada" +version = "1.9.99" +source = "git+https://github.com/tonlabs/ever-block.git?tag=1.9.99#9f5d12ef701780b45b24cf7cd5a767a3361dc9db" dependencies = [ "base64 0.13.1", "crc 3.0.1", - "ed25519", - "ed25519-dalek", + "ed25519 1.5.3", + "ed25519-dalek 1.0.1", "failure", "hex 0.4.3", "log", "num", "num-traits", "sha2 0.10.7", - "ton_types 2.0.18", + "ton_types 2.0.25", ] [[package]] name = "ton_block_json" -version = "0.7.170" -source = "git+https://github.com/tonlabs/ever-block-json.git?tag=0.7.170#03e78c8c0337893a302bcb205aabf503ca2da5c3" +version = "0.7.182" +source = "git+https://github.com/tonlabs/ever-block-json.git?tag=0.7.182#00e4625ac8d7c57aece3e7e7ce4a44641e815151" dependencies = [ "base64 0.13.1", "failure", @@ -2599,7 +2727,7 @@ dependencies = [ "serde_json", "ton_api", "ton_block", - "ton_types 2.0.18", + "ton_types 2.0.25", ] [[package]] @@ -2619,7 +2747,7 @@ dependencies = [ "chrono", "crc 3.0.1", "dirs 2.0.2", - "ed25519-dalek", + "ed25519-dalek 1.0.1", "ever-struct", "failure", "futures", @@ -2660,7 +2788,7 @@ dependencies = [ "ton_client_processing", "ton_executor", "ton_sdk", - "ton_types 2.0.18", + "ton_types 2.0.25", "ton_vm", "wasm-bindgen", "wasm-bindgen-futures", @@ -2676,7 +2804,7 @@ dependencies = [ "api_derive", "api_info", "async-trait", - "base64 0.21.2", + "base64 0.21.3", "futures", "log", "serde", @@ -2685,19 +2813,19 @@ dependencies = [ "serde_repr", "tokio", "ton_block", - "ton_types 2.0.18", + "ton_types 2.0.25", ] [[package]] name = "ton_executor" -version = "1.16.61" -source = "git+https://github.com/tonlabs/ever-executor.git?tag=1.16.61#17f7fa9c178bf4502b27af72fc6369690c6f58d0" +version = "1.16.73" +source = "git+https://github.com/tonlabs/ever-executor.git?tag=1.16.73#057134c40cfc9334b6bc42794d436f81b9d92ab5" dependencies = [ "failure", "lazy_static", "log", "ton_block", - "ton_types 2.0.18", + "ton_types 2.0.25", "ton_vm", ] @@ -2709,7 +2837,7 @@ dependencies = [ "api_info", "base64 0.10.1", "chrono", - "ed25519-dalek", + "ed25519-dalek 1.0.1", "failure", "hex 0.3.2", "lazy_static", @@ -2722,13 +2850,13 @@ dependencies = [ "sha2 0.9.9", "ton_abi", "ton_block", - "ton_types 2.0.18", + "ton_types 2.0.25", ] [[package]] name = "ton_tl_codegen" version = "0.1.0" -source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.25#67be17a07799e2c0d61d07eaf104f7c0c4bb7006" +source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.36#07d4f74698ffaa9030cf77eee1c816e73ea46272" dependencies = [ "crc 1.8.1", "failure", @@ -2762,15 +2890,15 @@ dependencies = [ [[package]] name = "ton_types" -version = "2.0.18" -source = "git+https://github.com/tonlabs/ever-types.git?tag=2.0.18#cc9e204f9122967b0f1d5af3208f8ccc36e706ef" +version = "2.0.25" +source = "git+https://github.com/tonlabs/ever-types.git?tag=2.0.25#0125046c56478924388b4e4586440d15d1948618" dependencies = [ "aes-ctr", "base64 0.13.1", "crc 3.0.1", - "curve25519-dalek", - "ed25519", - "ed25519-dalek", + "curve25519-dalek 4.1.0", + "ed25519 2.2.2", + "ed25519-dalek 2.0.0", "failure", "hex 0.4.3", "lazy_static", @@ -2779,7 +2907,7 @@ dependencies = [ "num", "num-derive", "num-traits", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_json", "sha2 0.10.7", @@ -2789,12 +2917,12 @@ dependencies = [ [[package]] name = "ton_vm" -version = "1.8.192" -source = "git+https://github.com/tonlabs/ever-vm.git?tag=1.8.192#58924257103ef49186f26e581b35a459a7b6cb1f" +version = "1.8.203" +source = "git+https://github.com/tonlabs/ever-vm.git?tag=1.8.203#00136e9c7bdf1223a912dea24e5a3103cc817cc0" dependencies = [ "diffy", - "ed25519", - "ed25519-dalek", + "ed25519 1.5.3", + "ed25519-dalek 1.0.1", "failure", "hex 0.4.3", "lazy_static", @@ -2804,7 +2932,7 @@ dependencies = [ "rand 0.7.3", "similar", "ton_block", - "ton_types 2.0.18", + "ton_types 2.0.25", "zstd", ] @@ -2959,9 +3087,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", @@ -3058,7 +3186,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", "wasm-bindgen-shared", ] @@ -3092,7 +3220,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3212,21 +3340,23 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if 1.0.0", + "windows-sys", ] [[package]] name = "x25519-dalek" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek", - "rand_core 0.5.1", + "curve25519-dalek 4.1.0", + "rand_core 0.6.4", + "serde", "zeroize", ] @@ -3247,9 +3377,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zeroize" -version = "1.3.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] @@ -3262,7 +3392,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.31", ] [[package]] diff --git a/ton_client/Cargo.toml b/ton_client/Cargo.toml index 28adf88e..d6759f5f 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.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' } +ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.141' } +ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.99' } +ton_block_json = { git = 'https://github.com/tonlabs/ever-block-json.git', tag = '0.7.182' } +ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.25' } +ton_executor = { features = ['signature_with_id'], git = 'https://github.com/tonlabs/ever-executor.git', tag = '1.16.73' } +ton_vm = { features = ['signature_with_id', 'signature_no_check'], git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.8.203' } +ever-struct = { git = 'https://github.com/tonlabs/ever-struct.git', tag = '1.0.6' } 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/tvm/call_tvm.rs b/ton_client/src/tvm/call_tvm.rs index 6ea3f273..2829ffd4 100644 --- a/ton_client/src/tvm/call_tvm.rs +++ b/ton_client/src/tvm/call_tvm.rs @@ -100,7 +100,7 @@ pub(crate) fn call_tvm( } Ok(_) => match engine.get_committed_state().get_root() { StackItem::Cell(data) => { - account.set_data(data); + account.set_data(data.clone()); Ok(engine) } _ => Err(Error::internal_error("invalid committed state")), diff --git a/ton_client_processing/Cargo.toml b/ton_client_processing/Cargo.toml index 4315aa71..1014cfc6 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.89' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.18' } +ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.99' } +ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.25' } api_derive = { path = '../api/derive' } api_info = { path = '../api/info' } diff --git a/ton_sdk/Cargo.toml b/ton_sdk/Cargo.toml index 96f0a3fe..a029859c 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.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' } +ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.141' } +ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.99' } +ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.25' } api_info = { path = '../api/info' } api_derive = { path = '../api/derive' } From b35620e7d01e987f65968b0c2cbef980778dfc9e Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Fri, 8 Sep 2023 16:41:01 +0300 Subject: [PATCH 5/7] Update dependencies --- Cargo.lock | 84 +++++++++++++------------------- ton_client/Cargo.toml | 14 +++--- ton_client_processing/Cargo.toml | 4 +- ton_sdk/Cargo.toml | 6 +-- 4 files changed, 45 insertions(+), 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5d305ada..83c0b76b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -331,9 +331,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" @@ -368,15 +368,14 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87d9d13be47a5b7c3907137f1290b0459a7f80efb26be8c52afb11963bccb02" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "time 0.1.45", "wasm-bindgen", "windows-targets", ] @@ -425,7 +424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.28", + "time", "version_check", ] @@ -442,7 +441,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "time 0.3.28", + "time", "url", ] @@ -787,14 +786,14 @@ dependencies = [ [[package]] name = "ever-struct" -version = "1.0.4" -source = "git+https://github.com/tonlabs/ever-struct.git?tag=1.0.6#5e235596129424affed9b0eb4cda94f9d03f1ce0" +version = "1.0.7" +source = "git+https://github.com/tonlabs/ever-struct.git?tag=1.0.7#7d5370dbfdcfd72bf7c66dc2ca72e4a82de8d213" dependencies = [ "anyhow", "failure", "hex-literal", "ton_block", - "ton_types 2.0.25", + "ton_types 2.0.26", ] [[package]] @@ -2502,17 +2501,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.28" @@ -2654,8 +2642,8 @@ dependencies = [ [[package]] name = "ton_abi" -version = "2.3.141" -source = "git+https://github.com/tonlabs/ever-abi.git?tag=2.3.141#346c264ebdff7e0cbe3e177e2994446fcf09c186" +version = "2.3.143" +source = "git+https://github.com/tonlabs/ever-abi.git?tag=2.3.143#5ac05d08129018ac76deb08d7593c8cf4d3a1848" dependencies = [ "base64 0.10.1", "byteorder", @@ -2671,13 +2659,13 @@ dependencies = [ "serde_json", "sha2 0.10.7", "ton_block", - "ton_types 2.0.25", + "ton_types 2.0.26", ] [[package]] name = "ton_api" -version = "0.3.36" -source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.36#07d4f74698ffaa9030cf77eee1c816e73ea46272" +version = "0.3.38" +source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.38#a836d3c5c92a2c42bbdeb45507cab92cd2b37da9" dependencies = [ "byteorder", "extfmt", @@ -2691,13 +2679,13 @@ dependencies = [ "serde_json", "ton_block", "ton_tl_codegen", - "ton_types 2.0.25", + "ton_types 2.0.26", ] [[package]] name = "ton_block" -version = "1.9.99" -source = "git+https://github.com/tonlabs/ever-block.git?tag=1.9.99#9f5d12ef701780b45b24cf7cd5a767a3361dc9db" +version = "1.9.101" +source = "git+https://github.com/tonlabs/ever-block.git?tag=1.9.101#0b9b35a2f5d30e47e26db03dc4db11a2084f9ffc" dependencies = [ "base64 0.13.1", "crc 3.0.1", @@ -2709,13 +2697,13 @@ dependencies = [ "num", "num-traits", "sha2 0.10.7", - "ton_types 2.0.25", + "ton_types 2.0.26", ] [[package]] name = "ton_block_json" -version = "0.7.182" -source = "git+https://github.com/tonlabs/ever-block-json.git?tag=0.7.182#00e4625ac8d7c57aece3e7e7ce4a44641e815151" +version = "0.7.184" +source = "git+https://github.com/tonlabs/ever-block-json.git?tag=0.7.184#0712036866af50c54b8543e93caaa35be819070c" dependencies = [ "base64 0.13.1", "failure", @@ -2727,7 +2715,7 @@ dependencies = [ "serde_json", "ton_api", "ton_block", - "ton_types 2.0.25", + "ton_types 2.0.26", ] [[package]] @@ -2788,7 +2776,7 @@ dependencies = [ "ton_client_processing", "ton_executor", "ton_sdk", - "ton_types 2.0.25", + "ton_types 2.0.26", "ton_vm", "wasm-bindgen", "wasm-bindgen-futures", @@ -2813,19 +2801,19 @@ dependencies = [ "serde_repr", "tokio", "ton_block", - "ton_types 2.0.25", + "ton_types 2.0.26", ] [[package]] name = "ton_executor" -version = "1.16.73" -source = "git+https://github.com/tonlabs/ever-executor.git?tag=1.16.73#057134c40cfc9334b6bc42794d436f81b9d92ab5" +version = "1.16.75" +source = "git+https://github.com/tonlabs/ever-executor.git?tag=1.16.75#7d318977e1e21261c46b787c67fbe04896d93f50" dependencies = [ "failure", "lazy_static", "log", "ton_block", - "ton_types 2.0.25", + "ton_types 2.0.26", "ton_vm", ] @@ -2850,13 +2838,13 @@ dependencies = [ "sha2 0.9.9", "ton_abi", "ton_block", - "ton_types 2.0.25", + "ton_types 2.0.26", ] [[package]] name = "ton_tl_codegen" version = "0.1.0" -source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.36#07d4f74698ffaa9030cf77eee1c816e73ea46272" +source = "git+https://github.com/tonlabs/ever-tl.git?tag=0.3.38#a836d3c5c92a2c42bbdeb45507cab92cd2b37da9" dependencies = [ "crc 1.8.1", "failure", @@ -2890,8 +2878,8 @@ dependencies = [ [[package]] name = "ton_types" -version = "2.0.25" -source = "git+https://github.com/tonlabs/ever-types.git?tag=2.0.25#0125046c56478924388b4e4586440d15d1948618" +version = "2.0.26" +source = "git+https://github.com/tonlabs/ever-types.git?tag=2.0.26#2942de3c92fada379789ca05042947c42c8143bf" dependencies = [ "aes-ctr", "base64 0.13.1", @@ -2917,8 +2905,8 @@ dependencies = [ [[package]] name = "ton_vm" -version = "1.8.203" -source = "git+https://github.com/tonlabs/ever-vm.git?tag=1.8.203#00136e9c7bdf1223a912dea24e5a3103cc817cc0" +version = "1.8.205" +source = "git+https://github.com/tonlabs/ever-vm.git?tag=1.8.205#047b70c39dd34c45f3e058a34fc2e8405a5efaf5" dependencies = [ "diffy", "ed25519 1.5.3", @@ -2932,7 +2920,7 @@ dependencies = [ "rand 0.7.3", "similar", "ton_block", - "ton_types 2.0.25", + "ton_types 2.0.26", "zstd", ] @@ -3153,12 +3141,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/ton_client/Cargo.toml b/ton_client/Cargo.toml index d6759f5f..ceec255a 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.141' } -ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.99' } -ton_block_json = { git = 'https://github.com/tonlabs/ever-block-json.git', tag = '0.7.182' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.25' } -ton_executor = { features = ['signature_with_id'], git = 'https://github.com/tonlabs/ever-executor.git', tag = '1.16.73' } -ton_vm = { features = ['signature_with_id', 'signature_no_check'], git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.8.203' } -ever-struct = { git = 'https://github.com/tonlabs/ever-struct.git', tag = '1.0.6' } +ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.143' } +ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.101' } +ton_block_json = { git = 'https://github.com/tonlabs/ever-block-json.git', tag = '0.7.184' } +ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.26' } +ton_executor = { features = ['signature_with_id'], git = 'https://github.com/tonlabs/ever-executor.git', tag = '1.16.75' } +ton_vm = { features = ['signature_with_id', 'signature_no_check'], git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.8.205' } +ever-struct = { git = 'https://github.com/tonlabs/ever-struct.git', tag = '1.0.7' } 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_processing/Cargo.toml b/ton_client_processing/Cargo.toml index 1014cfc6..83848a6f 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.99' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.25' } +ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.101' } +ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.26' } api_derive = { path = '../api/derive' } api_info = { path = '../api/info' } diff --git a/ton_sdk/Cargo.toml b/ton_sdk/Cargo.toml index a029859c..3456e2f9 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.141' } -ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.99' } -ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.25' } +ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.143' } +ton_block = { git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.101' } +ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.26' } api_info = { path = '../api/info' } api_derive = { path = '../api/derive' } From c43cae64b47b3c019da053376d3d6b77aee81903 Mon Sep 17 00:00:00 2001 From: tonjen Date: Fri, 8 Sep 2023 16:27:42 +0000 Subject: [PATCH 6/7] Update docs --- tools/api.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/api.json b/tools/api.json index 7844cf5f..95d23fd7 100644 --- a/tools/api.json +++ b/tools/api.json @@ -1,5 +1,5 @@ { - "version": "1.44.2", + "version": "1.44.3", "modules": [ { "name": "client", From 419e0fc1072913f36338b3027c9590befd98f3f2 Mon Sep 17 00:00:00 2001 From: tonjen Date: Fri, 8 Sep 2023 16:30:48 +0000 Subject: [PATCH 7/7] Update trusted blocks --- ton_client/src/proofs/trusted_key_blocks.bin | Bin 464704 -> 476224 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 13611c2e21ae01902c996ee1f0f63c4e3db45b0f..1d381032c69859103d6a1cbc64600cbebb438378 100644 GIT binary patch delta 11659 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 delta 47 zcmX@mA$wq*%mfW49<@fTRxQR>Ev8m2=2k71ty-+xBBy6GuqrUdwRbkKZtrYhv)>B< DZ%z-I