From 09758373208402a7eb3351c5a31e52cbfc032cb1 Mon Sep 17 00:00:00 2001 From: SilkovAlexander Date: Fri, 8 Jul 2022 17:12:53 +0300 Subject: [PATCH 1/4] Fixed debug run gas limit --- Cargo.lock | 14 +++++++------- Cargo.toml | 2 +- src/debug.rs | 15 +++++++++------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7631de4d..5dc14bb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,9 +135,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", @@ -954,9 +954,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.19" +version = "0.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" +checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" dependencies = [ "bytes", "futures-channel", @@ -1340,9 +1340,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.28.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" dependencies = [ "memchr", ] @@ -2556,7 +2556,7 @@ dependencies = [ [[package]] name = "tonos-cli" -version = "0.27.1" +version = "0.27.2" dependencies = [ "assert_cmd", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 20a8f4cf..73d93ee9 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.27.1' +version = '0.27.2' [dependencies] async-trait = '0.1.42' diff --git a/src/debug.rs b/src/debug.rs index 552a9daa..c4c69028 100644 --- a/src/debug.rs +++ b/src/debug.rs @@ -555,7 +555,7 @@ async fn debug_call_command(matches: &ArgMatches<'_>, config: &Config, is_getter let ton_client = create_client(&config)?; // TODO: create local for boc and tvc let input = input.unwrap(); - let account = if is_tvc { + let mut account = if is_tvc { construct_account_from_tvc(input, matches.value_of("ACCOUNT_ADDRESS"), Some(u64::MAX))? @@ -614,6 +614,9 @@ async fn debug_call_command(matches: &ArgMatches<'_>, config: &Config, is_getter let message = Message::construct_from_base64(&message.message) .map_err(|e| format!("Failed to construct message: {}", e))?; + if is_getter { + account.set_balance(CurrencyCollection::with_grams(u64::MAX)); + } let mut acc_root = account.serialize() .map_err(|e| format!("Failed to serialize account: {}", e))?; @@ -1019,13 +1022,13 @@ pub async fn execute_debug( gas_price: 65536000, flat_gas_limit: 100, flat_gas_price: 1000000, - gas_limit: 1000000, - special_gas_limit: 10000000, - gas_credit: 10000000, - block_gas_limit: 10000000, + gas_limit: u64::MAX, + special_gas_limit: u64::MAX, + gas_credit: u64::MAX, + block_gas_limit: u64::MAX, freeze_due_limit: 100000000, delete_due_limit:1000000000, - max_gas_threshold:10000000000, + max_gas_threshold:u128::MAX, }; let c20 = ConfigParamEnum::ConfigParam20(gas.clone()); let c21 = ConfigParamEnum::ConfigParam21(gas); From e57a68387682c8507f7463e95997f489f2e0b64e Mon Sep 17 00:00:00 2001 From: Tonjen Date: Fri, 8 Jul 2022 14:38:33 +0000 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 898a45fc..f3926e08 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.2 + +### New + - Remove convert and callex + + ## Version: 0.27.1 ### Breaking changes: From bf33962425c463698d5094b245c1d7c68eae33e9 Mon Sep 17 00:00:00 2001 From: SilkovAlexander Date: Mon, 11 Jul 2022 16:13:26 +0300 Subject: [PATCH 3/4] Fixed changelog and lock --- CHANGELOG.md | 6 +++--- Cargo.lock | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3926e08..7e293055 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,10 @@ All notable changes to this project will be documented in this file. -## Version: 0.27.2 +## Version: 0.27.6 -### New - - Remove convert and callex +### Bug fixes +- Fixed `debug run` gas limits ## Version: 0.27.1 diff --git a/Cargo.lock b/Cargo.lock index 5dc14bb4..d1bcaef3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,9 +463,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5999502d32b9c48d492abe66392408144895020ec4709e549e840799f3bb74c0" +checksum = "2ccfd8c0ee4cce11e45b3fd6f9d5e69e0cc62912aa6a0cb1bf4617b0eba5a12f" dependencies = [ "generic-array 0.14.5", "typenum", @@ -844,9 +844,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022" [[package]] name = "hermit-abi" @@ -1013,7 +1013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.12.1", + "hashbrown 0.12.2", ] [[package]] @@ -1367,9 +1367,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.40" +version = "0.10.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" +checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" dependencies = [ "bitflags", "cfg-if", @@ -1399,9 +1399,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.74" +version = "0.9.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1" +checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" dependencies = [ "autocfg", "cc", @@ -1837,18 +1837,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.138" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.138" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -2556,7 +2556,7 @@ dependencies = [ [[package]] name = "tonos-cli" -version = "0.27.2" +version = "0.27.6" dependencies = [ "assert_cmd", "async-trait", From 46fd64b774e8dd460ea6b39e264866868ae85c63 Mon Sep 17 00:00:00 2001 From: Tonjen Date: Wed, 13 Jul 2022 17:23:30 +0000 Subject: [PATCH 4/4] Auto update patch version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cfb8dfb4..fdd008f5 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.27.6' +version = '0.27.7' [dependencies] async-trait = '0.1.42'