diff --git a/CHANGELOG.md b/CHANGELOG.md index 93ededee..d22f6d5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. + +## [1.43.2] – 2023-06-09 + +### 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 ### Fixed diff --git a/Cargo.lock b/Cargo.lock index 5e3d07e2..53201480 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 7a0fba19..d7ca0c6d 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 0979f026..bd535d53 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 55f1e1ca..0ccc65cc 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 c5ec78d6..ebf047d0 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_client/src/processing/internal.rs b/ton_client/src/processing/internal.rs index 181111a2..a206e023 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) diff --git a/ton_client/src/processing/wait_for_transaction.rs b/ton_client/src/processing/wait_for_transaction.rs index 28da0a1d..b5ab987f 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/proofs/trusted_key_blocks.bin b/ton_client/src/proofs/trusted_key_blocks.bin index d066c942..53f8e3c3 100644 Binary files a/ton_client/src/proofs/trusted_key_blocks.bin and b/ton_client/src/proofs/trusted_key_blocks.bin differ diff --git a/ton_client/src/tests/common.rs b/ton_client/src/tests/common.rs index 95a902f6..4cf8d182 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" } }), diff --git a/ton_sdk/Cargo.toml b/ton_sdk/Cargo.toml index e46e9c32..f7fbb500 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 f4ab1a80..b2e52aac 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' diff --git a/tools/api.json b/tools/api.json index 7276a1a2..da2c9c1e 100644 --- a/tools/api.json +++ b/tools/api.json @@ -1,5 +1,5 @@ { - "version": "1.43.1", + "version": "1.43.2", "modules": [ { "name": "client",