Merge pull request #69 from tonlabs/copyleft

Account with init code hash

Author: d3p

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Release Notes
 All notable changes to this project will be documented in this file.
 
+## 0.30.0 Feb 17, 2022
+### New
+- Account has new field `init_code_hash`
+- `q-server` 0.47.0 with `X-Evernode-Expected-Account-Boc-Version` header support
+
 ## 0.29.1 Feb 17, 2022
 ### Fixed
 - Build with new version q-server 0.46.0

docker/ton-node/blockchain.conf.json

@@ -14,7 +14,7 @@
   ],
   "p8": {
     "version": 5,
-    "capabilities": "1070"
+    "capabilities": "1326"
   },
   "p9": [
     0,

ton-node-se/create_msg/Cargo.toml

@@ -11,10 +11,10 @@ hex = "0.4.2"
 serde_json = "1.0.62"
 tokio = { version = "0.2.13", features = ["macros"] }
 
-ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.38' }
+ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.39' }
 ton_client = { git = 'https://github.com/tonlabs/TON-SDK.git', package = "ton_client", tag = '1.28.0' }
 ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.12' }
-ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.31' }
+ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.32' }
 
 ton_node_old = { path = "../ton_node" }
 

ton-node-se/poa/Cargo.toml

@@ -32,8 +32,8 @@ rustc-hex = "1.0"
 unexpected = { path = "parity/util/unexpected" }
 
 # In-house
-ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', default-features = false, tag = '1.8.31' }
-ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.38' }
+ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', default-features = false, tag = '1.8.32' }
+ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.39' }
 ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.12' }
 
 

ton-node-se/ton_node/Cargo.toml

@@ -33,11 +33,11 @@ tokio-io-timeout = "0.3.1"
 # Domestic
 poa = { path = "../poa" }
 ton_api = { git = 'https://github.com/tonlabs/ton-labs-tl', package = 'ton_api', tag = '0.2.110' }
-ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.38' }
-ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.54' }
+ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.39' }
+ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.56' }
 ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.12' }
-ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.31' }
-ton_labs_assembler = { git = "https://github.com/tonlabs/ton-labs-assembler.git", tag = '1.2.30' }
+ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.32' }
+ton_labs_assembler = { git = "https://github.com/tonlabs/ton-labs-assembler.git", tag = '1.2.31' }
 
 # TBD
 #ethcore-network = { git = "https://github.com/paritytech/parity-ethereum.git", package = "ethcore-network" } 

ton-node-se/ton_node_startup/Cargo.toml

@@ -8,11 +8,11 @@ clap = "2.32.0"
 log = "0.4.6"
 log4rs = "0.8.3"
 ton_node = { path = "../ton_node", features = ["startup_node"], package = "ton_node_old" }
-ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.38' }
-ton_block_json = { git = "https://github.com/tonlabs/ton-labs-block-json.git", tag = '0.7.3' }
-ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.54' }
+ton_block = { git = 'https://github.com/tonlabs/ton-labs-block', tag = '1.7.39' }
+ton_block_json = { git = "https://github.com/tonlabs/ton-labs-block-json.git", tag = '0.7.5' }
+ton_executor = { git = 'https://github.com/tonlabs/ton-labs-executor', tag = '1.15.56' }
 ton_types = { git = 'https://github.com/tonlabs/ton-labs-types', tag = '1.10.12' }
-ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.31' }
+ton_vm = { git = 'https://github.com/tonlabs/ton-labs-vm', tag = '1.8.32' }
 ed25519-dalek = "1.0.0-pre.4"
 reqwest = "0.9.7"
 http = "0.1.17"

ton-node-se/ton_node_startup/src/types.rs

@@ -21,7 +21,7 @@ use ton_node::node_engine::{DocumentsDb, MessagesReceiver};
 use ton_node::error::{NodeResult, NodeErrorKind, NodeError};
 use ton_node::node_engine::messages::{InMessagesQueue, QueuedMessage};
 use serde::Deserialize;
-use ton_types::{AccountId, SliceData};
+use ton_types::{AccountId, SliceData, BuilderData};
 use ton_types::cells_serialization::serialize_toc;
 use ton_types::types::UInt256;
 use std::io::Cursor;
@@ -405,9 +405,17 @@ impl DocumentsDb for ArangoHelper {
         let account_addr = account.get_id().unwrap_or_default();
         let cell = account.serialize()?;
         let boc = serialize_toc(&cell)?;
+        let mut boc1 = None;
+        if account.init_code_hash().is_some() {
+            // new format
+            let mut builder = BuilderData::new();
+            account.write_original_format(&mut builder)?;
+            boc1 = Some(serialize_toc(&builder.into_cell()?)?);
+        }
         let set = AccountSerializationSet {
             account,
             boc,
+            boc1,
             proof: None,
             ..Default::default()
         };