Merge pull request #479 from tonlabs/1.22.0-rc

Version 1.22.0
everx-labs · Sep 22, 2021 · bb009d2 · bb009d2
2 parents dae8925 + ea837e2
commit bb009d2
Show file tree

Hide file tree

Showing 27 changed files with 1,259 additions and 111 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.22.0] – 2021-09-20
+
+### New
+- ABI v2.2 with fixed message body layout supported. [See the specification](https://github.com/tonlabs/ton-labs-abi/blob/master/docs/ABI_2.2_spec.md).
+
+  Now, for contracts with ABI version < 2.2  compact layout will still be used for compatibility, for contracts with ABI version 2.2 and more - fixed layout will be used.  
+**Please, make sure that you updated the ABI if you recompiled your contract with 2.2 ABI, or you may get an inconsistent contract behaviour**.
+- **Debot module**:
+    - added `getEncryptionBoxInfo`, `getSigningBoxInfo` functions to Sdk interface.
+    - implemented Query DeBot interface in DEngine.
+
 ## [1.21.5] – 2021-09-13
 
 ### Fixed

diff --git a/api/derive/Cargo.toml b/api/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "api_derive"
-version = "1.21.5"
+version = "1.22.0"
 authors = ["TON DEV SOLUTIONS LTD <[email protected]>"]
 edition = "2018"
 

diff --git a/api/info/Cargo.toml b/api/info/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "api_info"
-version = "1.21.5"
+version = "1.22.0"
 authors = ["TON DEV SOLUTIONS LTD <[email protected]>"]
 edition = "2018"
 

diff --git a/api/test/Cargo.toml b/api/test/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "api_test"
-version = "1.21.5"
+version = "1.22.0"
 authors = ["TON DEV SOLUTIONS LTD <[email protected]>"]
 edition = "2018"
 

diff --git a/docs/mod_boc.md b/docs/mod_boc.md
@@ -26,7 +26,7 @@ BOC manipulation module.
 
 [cache_unpin](#cache_unpin) – Unpin BOCs with specified pin.
 
-[encode_boc](#encode_boc) – Encodes BOC from builder operations.
+[encode_boc](#encode_boc) – Encodes bag of cells (BOC) with builder operations. This method provides the same functionality as Solidity TvmBuilder. Resulting BOC of this method can be passed into Solidity and C++ contracts as TvmCell type
 
 ## Types
 [BocCacheType](#BocCacheType)
@@ -369,7 +369,7 @@ function cache_unpin(
 
 ## encode_boc
 
-Encodes BOC from builder operations.
+Encodes bag of cells (BOC) with builder operations. This method provides the same functionality as Solidity TvmBuilder. Resulting BOC of this method can be passed into Solidity and C++ contracts as TvmCell type
 
 ```ts
 type ParamsOfEncodeBoc = {

diff --git a/docs/modules.md b/docs/modules.md
@@ -155,7 +155,7 @@ Where:
 
 [cache_unpin](mod_boc.md#cache_unpin) – Unpin BOCs with specified pin.
 
-[encode_boc](mod_boc.md#encode_boc) – Encodes BOC from builder operations.
+[encode_boc](mod_boc.md#encode_boc) – Encodes bag of cells (BOC) with builder operations. This method provides the same functionality as Solidity TvmBuilder. Resulting BOC of this method can be passed into Solidity and C++ contracts as TvmCell type
 
 ## [processing](mod_processing.md) – Message processing module.
 

diff --git a/ton_client/Cargo.toml b/ton_client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ton_client"
-version = "1.21.5"
+version = "1.22.0"
 authors = ["TON DEV SOLUTIONS LTD <[email protected]>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -59,10 +59,13 @@ scrypt = { version = "0.7.0", default-features = false }
 serde = "1.0.91"
 serde_derive = "1.0.91"
 serde_json = "1.0.41"
+serde_repr = "0.1.7"
 sha2 = "0.9.5"
-tiny-bip39 = "0.8.0"
 tokio = { version = "0.2.13", features = ["sync", "stream"], default-features = false }
 zstd = { version = "0.7.0", default-features = false }
+# TODO: remove fixed versioning when tiny-bip39 compilation issue is resolved
+tiny-bip39 = "=0.8.0"
+zeroize_derive = "=1.1.0"
 
 # optional for std
 reqwest = { version = "0.10.4", optional = true }

diff --git a/ton_client/src/abi/decode_message.rs b/ton_client/src/abi/decode_message.rs
@@ -138,7 +138,7 @@ fn decode_body(
         }
     } else if let Ok(input) = abi.decode_input(body.clone(), is_internal) {
         let (header, _, _) =
-            ton_abi::Function::decode_header(abi.version().major, body.clone(), abi.header(), is_internal)
+            ton_abi::Function::decode_header(abi.version(), body.clone(), abi.header(), is_internal)
                 .map_err(|err| {
                     Error::invalid_message_for_decode(format!(
                         "Can't decode function header: {}",

diff --git a/ton_client/src/boc/encode.rs b/ton_client/src/boc/encode.rs
@@ -81,7 +81,10 @@ pub struct ResultOfEncodeBoc {
     pub boc: String,
 }
 
-/// Encodes BOC from builder operations.
+/// Encodes bag of cells (BOC) with builder operations.
+/// This method provides the same functionality as Solidity TvmBuilder.
+/// Resulting BOC of this method can be passed into 
+/// Solidity and C++ contracts as TvmCell type
 #[api_function]
 pub async fn encode_boc(
     context: std::sync::Arc<ClientContext>,

diff --git a/ton_client/src/debot/dinterface.rs b/ton_client/src/debot/dinterface.rs
@@ -2,6 +2,7 @@ use super::base64_interface::Base64Interface;
 use super::hex_interface::HexInterface;
 use super::sdk_interface::SdkInterface;
 use super::network_interface::NetworkInterface;
+use super::query_interface::QueryInterface;
 use crate::abi::{decode_message_body, Abi, ParamsOfDecodeMessageBody};
 use crate::boc::{parse_message, ParamsOfParse};
 use crate::debot::TonClient;
@@ -117,6 +118,9 @@ impl BuiltinInterfaces {
         let iface: Arc<dyn DebotInterface + Send + Sync> = Arc::new(NetworkInterface::new(client.clone()));
         interfaces.insert(iface.get_id(), iface);
 
+        let iface: Arc<dyn DebotInterface + Send + Sync> = Arc::new(QueryInterface::new(client.clone()));
+        interfaces.insert(iface.get_id(), iface);
+
         let iface: Arc<dyn DebotInterface + Send + Sync> =
             Arc::new(SdkInterface::new(client.clone()));
         interfaces.insert(iface.get_id(), iface);

diff --git a/ton_client/src/debot/mod.rs b/ton_client/src/debot/mod.rs
@@ -27,6 +27,7 @@ mod helpers;
 mod info;
 mod msg_interface;
 mod network_interface;
+mod query_interface;
 mod routines;
 mod run_output;
 mod sdk_interface;