Merge pull request #131 from tonlabs/0.37.1-rc

Version 0.37.1

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Release Notes
 All notable changes to this project will be documented in this file.
 
+## 0.37.1 Mar 21, 2023
+
+### Fixed
+
+- Build docker image with q-server v0.55.0
+- Post request with several external messages processed only of the messages
+
 ## 0.37.0 Feb 17, 2023
 
 ### New

docker/Dockerfile

@@ -1,6 +1,6 @@
 ARG TON_NODE
 
-FROM node:14-buster as q-server-build
+FROM node:18-buster as q-server-build
 
 ARG Q_SERVER_GITHUB_REPO
 ARG Q_SERVER_GITHUB_REV

node/Cargo.toml

@@ -2,7 +2,7 @@
 edition = '2021'
 build = 'build.rs'
 name = 'ton_node_startup'
-version = '0.37.0'
+version = '0.37.1'
 
 [dependencies]
 # External

node/src/api/message_api.rs

@@ -105,10 +105,10 @@ impl MessageReceiverApi {
                                 message = msg;
                                 thread::sleep(Duration::from_micros(100));
                             }
-
-                            return Ok(Response::with(status::Ok));
                         }
                     }
+
+                    return Ok(Response::with(status::Ok));
                 }
             }
         }

node/src/block/builder.rs

@@ -91,6 +91,7 @@ impl BlockBuilder {
             block_info,
             rand_seed,
             start_lt,
+            end_lt: start_lt + 1,
             ..Default::default()
         })
     }
@@ -130,12 +131,11 @@ impl BlockBuilder {
         executor: &OrdinaryTransactionExecutor,
         acc_root: &mut Cell,
         msg: &Message,
-        acc_last_lt: u64,
+        last_lt: u64,
         debug: bool,
     ) -> NodeResult<(Transaction, u64)> {
         let (block_unixtime, block_lt) = self.at_and_lt();
-        let last_lt = std::cmp::max(acc_last_lt, block_lt);
-        let lt = Arc::new(AtomicU64::new(last_lt + 1));
+        let lt = Arc::new(AtomicU64::new(last_lt));
         let result = executor.execute_with_libs_and_params(
             Some(&msg),
             acc_root,
@@ -157,8 +157,14 @@ impl BlockBuilder {
                 Ok((transaction, lt.load(Ordering::Relaxed)))
             }
             Err(err) => {
-                let lt = last_lt + 1;
-                let account = Account::construct_from_cell(acc_root.clone())?;
+                let old_hash = acc_root.repr_hash();
+                let mut account = Account::construct_from_cell(acc_root.clone())?;
+                let lt = std::cmp::max(
+                    account.last_tr_time().unwrap_or(0), 
+                    std::cmp::max(last_lt, msg.lt().unwrap_or(0) + 1)
+                );
+                account.set_last_tr_time(lt);
+                *acc_root = account.serialize()?;
                 let mut transaction = Transaction::with_account_and_message(&account, msg, lt)?;
                 transaction.set_now(block_unixtime);
                 let mut description = TransactionDescrOrdinary::default();
@@ -192,8 +198,7 @@ impl BlockBuilder {
                     _ => return Err(err)?,
                 }
                 transaction.write_description(&TransactionDescr::Ordinary(description))?;
-                let hash = acc_root.repr_hash();
-                let state_update = HashUpdate::with_hashes(hash.clone(), hash);
+                let state_update = HashUpdate::with_hashes(old_hash, acc_root.repr_hash());
                 transaction.write_state_update(&state_update)?;
                 Ok((transaction, lt))
             }
@@ -219,7 +224,7 @@ impl BlockBuilder {
             &executor,
             &mut acc_root,
             &message,
-            shard_acc.last_trans_lt(),
+            std::cmp::max(self.start_lt, shard_acc.last_trans_lt() + 1),
             debug,
         )?;
         self.end_lt = std::cmp::max(self.end_lt, max_lt);