From 91c33188784581e6856ebb748dfb319525923b0e Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Fri, 9 Jun 2023 14:03:21 +0300 Subject: [PATCH 1/6] Version 1.43.2 --- Cargo.lock | 12 ++++++------ api/derive/Cargo.toml | 2 +- api/info/Cargo.toml | 2 +- api/test/Cargo.toml | 2 +- ton_client/Cargo.toml | 2 +- ton_sdk/Cargo.toml | 2 +- toncli/Cargo.toml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5e3d07e22..532014801 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -107,7 +107,7 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "api_derive" -version = "1.43.1" +version = "1.43.2" dependencies = [ "api_info", "proc-macro2", @@ -118,7 +118,7 @@ dependencies = [ [[package]] name = "api_info" -version = "1.43.1" +version = "1.43.2" dependencies = [ "serde", "serde_derive", @@ -127,7 +127,7 @@ dependencies = [ [[package]] name = "api_test" -version = "1.43.1" +version = "1.43.2" dependencies = [ "api_derive", "api_info", @@ -2585,7 +2585,7 @@ dependencies = [ [[package]] name = "ton_client" -version = "1.43.1" +version = "1.43.2" dependencies = [ "aes", "api_derive", @@ -2684,7 +2684,7 @@ dependencies = [ [[package]] name = "ton_sdk" -version = "1.43.1" +version = "1.43.2" dependencies = [ "api_derive", "api_info", @@ -2792,7 +2792,7 @@ dependencies = [ [[package]] name = "toncli" -version = "1.43.1" +version = "1.43.2" dependencies = [ "api_info", "assert_cmd", diff --git a/api/derive/Cargo.toml b/api/derive/Cargo.toml index 7a0fba19d..d7ca0c6d4 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.43.1' +version = '1.43.2' [dependencies] quote = '1.0.26' diff --git a/api/info/Cargo.toml b/api/info/Cargo.toml index 0979f0265..bd535d533 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.43.1' +version = '1.43.2' [dependencies] serde = '1.0.115' diff --git a/api/test/Cargo.toml b/api/test/Cargo.toml index 55f1e1ca7..0ccc65ccc 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.43.1' +version = '1.43.2' [dependencies] serde = '1.0.115' diff --git a/ton_client/Cargo.toml b/ton_client/Cargo.toml index c5ec78d67..ebf047d09 100644 --- a/ton_client/Cargo.toml +++ b/ton_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'ton_client' -version = '1.43.1' +version = '1.43.2' authors = [ 'TON Labs LTD ' ] edition = '2018' license = 'Apache-2.0' diff --git a/ton_sdk/Cargo.toml b/ton_sdk/Cargo.toml index e46e9c325..f7fbb500b 100644 --- a/ton_sdk/Cargo.toml +++ b/ton_sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = 'ton_sdk' -version = '1.43.1' +version = '1.43.2' edition = '2018' license = 'Apache-2.0' authors = [ 'TON Labs LTD ' ] diff --git a/toncli/Cargo.toml b/toncli/Cargo.toml index f4ab1a808..b2e52aac5 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.43.1' +version = '1.43.2' [dependencies] base64 = '0.13.0' From 9d142cb3e79a78860f65293613ba1d320b18fc53 Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Fri, 9 Jun 2023 14:09:18 +0300 Subject: [PATCH 2/6] Non existing accounts are treated as missing --- CHANGELOG.md | 7 +++++++ ton_client/src/processing/internal.rs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93ededeeb..2161b5e57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. + +## [1.43.2] – 2023-06-01 + +### Fixed + +- Non existing accounts are treated as missing since q-server return `non existed` if account is missing + ## [1.43.1] – 2023-06-01 ### Fixed diff --git a/ton_client/src/processing/internal.rs b/ton_client/src/processing/internal.rs index 181111a23..a206e0239 100644 --- a/ton_client/src/processing/internal.rs +++ b/ton_client/src/processing/internal.rs @@ -91,7 +91,7 @@ async fn get_local_error( let account = fetch_account(context.clone(), address, "boc last_paid acc_type").await?; if account["acc_type"].as_i64() == Some(ACCOUNT_NONEXIST as i64) { - return Ok("Account is deleted".to_owned()); + return Err(crate::tvm::Error::account_missing(address)); } let account: Account = serde_json::from_value(account) From 1be7b5c2a13e8cea16871b36d8eccf36ebf01472 Mon Sep 17 00:00:00 2001 From: tonjen Date: Fri, 9 Jun 2023 13:41:07 +0000 Subject: [PATCH 3/6] Update docs --- tools/api.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/api.json b/tools/api.json index 7276a1a20..da2c9c1e9 100644 --- a/tools/api.json +++ b/tools/api.json @@ -1,5 +1,5 @@ { - "version": "1.43.1", + "version": "1.43.2", "modules": [ { "name": "client", From c315b6c6462f38789a259ed413e3743977a468ec Mon Sep 17 00:00:00 2001 From: tonjen Date: Fri, 9 Jun 2023 13:46:15 +0000 Subject: [PATCH 4/6] Update trusted blocks --- ton_client/src/proofs/trusted_key_blocks.bin | Bin 410524 -> 415348 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 d066c94229e28e1d0f2283c0fe04274f8ad11b69..53f8e3c338b0a0b157b89404d18b84ce5e9afe6a 100644 GIT binary patch delta 4906 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 delta 43 zcmeyeMsiNO Date: Fri, 9 Jun 2023 20:36:17 +0300 Subject: [PATCH 5/6] Version 1.43.2 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2161b5e57..91d1cecf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. -## [1.43.2] – 2023-06-01 +## [1.43.2] – 2023-06-09 ### Fixed From ec6f7df469c8d169b5d05f39f15e81c8d71f7327 Mon Sep 17 00:00:00 2001 From: Alexey Vavilin Date: Wed, 14 Jun 2023 10:58:57 +0300 Subject: [PATCH 6/6] Fix long expire timeout --- CHANGELOG.md | 1 + ton_client/src/processing/wait_for_transaction.rs | 4 +++- ton_client/src/tests/common.rs | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91d1cecf1..d22f6d5eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. ### Fixed - Non existing accounts are treated as missing since q-server return `non existed` if account is missing +- Next block awaiting timeout calculation on message with long expiration time ## [1.43.1] – 2023-06-01 diff --git a/ton_client/src/processing/wait_for_transaction.rs b/ton_client/src/processing/wait_for_transaction.rs index 28da0a1d6..b5ab987fa 100644 --- a/ton_client/src/processing/wait_for_transaction.rs +++ b/ton_client/src/processing/wait_for_transaction.rs @@ -314,7 +314,9 @@ async fn wait_by_block_walking + Send>( loop { let now = context.env.now_ms(); let fetch_block_timeout = - (std::cmp::max(max_block_time, now) - now).try_into().unwrap_or(u32::MAX) + processing_timeout; + (std::cmp::max(max_block_time, now) - now + processing_timeout as u64) + .try_into() + .unwrap_or(u32::MAX); log::debug!("fetch_block_timeout {}", fetch_block_timeout); let block = fetching::fetch_next_shard_block( diff --git a/ton_client/src/tests/common.rs b/ton_client/src/tests/common.rs index 95a902f68..4cf8d1828 100644 --- a/ton_client/src/tests/common.rs +++ b/ton_client/src/tests/common.rs @@ -15,7 +15,7 @@ fn test_parallel_requests() { .request_json( "net.wait_for_collection", json!({ - "collection": "accounts".to_owned(), + "collection": "messages".to_owned(), "filter": json!({ "id": { "eq": "123" } }),