feat(collator): use tycho-executor

Cargo.toml

@@ -118,9 +118,8 @@ weedb = "0.4.1"
 zstd-safe = "7.2"
 zstd-sys = "2.0"
 
-# TODO: RIIR
-ton_executor = { git = "https://github.com/broxus/ton-labs-executor.git", rev = "de566312176aa524d4afc26a04c931f97079b77f" }
-tycho-vm = { git = "https://github.com/broxus/tycho-vm.git" }
+tycho-executor = { git = "https://github.com/broxus/tycho-vm.git", rev = "b1e08e7e082ae66561ba14c7f9753ce1b168b5ff" }
+tycho-vm = { git = "https://github.com/broxus/tycho-vm.git", rev = "b1e08e7e082ae66561ba14c7f9753ce1b168b5ff" }
 
 # local deps
 tycho-block-util = { path = "./block-util", version = "0.2.3" }
@@ -134,7 +133,7 @@ tycho-storage = { path = "./storage", version = "0.2.3" }
 tycho-util = { path = "./util", version = "0.2.3" }
 
 [patch.crates-io]
-everscale-types = { git = "https://github.com/broxus/everscale-types.git", rev = "adada6e6539abd798dbbc5a7fc1d17cc31fa7eff" }
+everscale-types = { git = "https://github.com/broxus/everscale-types.git", rev = "9dcfe1aa2ebeca82428cc860267653ec8036725e" }
 
 [workspace.lints.rust]
 future_incompatible = "warn"

block-util/src/block/block_proof_stuff.rs

@@ -20,6 +20,8 @@ pub struct BlockProofStuff {
 impl BlockProofStuff {
     #[cfg(any(test, feature = "test"))]
     pub fn new_empty(block_id: &BlockId) -> Self {
+        use everscale_types::cell::Lazy;
+
         let block_info = BlockInfo {
             shard: block_id.shard,
             seqno: block_id.seqno,
@@ -101,7 +103,7 @@ impl BlockProofStuff {
     }
 
     pub fn virtualize_block_root(&self) -> Result<&DynCell> {
-        let merkle_proof = self.inner.proof.root.parse::<MerkleProofRef<'_>>()?;
+        let merkle_proof = self.inner.proof.root.parse_exotic::<MerkleProofRef<'_>>()?;
         let block_virt_root = merkle_proof.cell.virtualize();
 
         anyhow::ensure!(

block-util/src/block/block_stuff.rs

@@ -38,6 +38,7 @@ impl BlockStuff {
 
     #[cfg(any(test, feature = "test"))]
     pub fn new_empty(shard: ShardIdent, seqno: u32) -> Self {
+        use everscale_types::cell::Lazy;
         use everscale_types::merkle::MerkleUpdate;
 
         const DATA_SIZE: usize = 1024; // ~1 KB of data for an empty block.

block-util/src/dict.rs

@@ -1,9 +1,9 @@
+use everscale_types::cell::Lazy;
 use everscale_types::dict::{
     aug_dict_insert, aug_dict_remove_owned, build_aug_dict_from_sorted_iter, AugDictExtra, DictKey,
     SetMode,
 };
 use everscale_types::error::Error;
-use everscale_types::models::Lazy;
 use everscale_types::prelude::*;
 
 pub struct RelaxedAugDict<K, A, V> {
@@ -56,7 +56,7 @@ where
             dict_root: build_aug_dict_from_sorted_iter(
                 iter.into_iter().map(|(k, a, v)| {
                     // SAFETY: We know that this cell is not a library cell.
-                    let value = v.inner().as_slice_allow_pruned();
+                    let value = v.inner().as_slice_allow_exotic();
                     (k, a, value)
                 }),
                 K::BITS,

block-util/src/message/ext_msg_repr.rs

@@ -54,7 +54,7 @@ impl ExtMsgRepr {
         }
 
         // Start parsing the message (we are sure now that it is an ordinary cell).
-        let mut cs = msg_root.as_slice_allow_pruned();
+        let mut cs = msg_root.as_slice_allow_exotic();
 
         // Parse info first.
         let info = MsgInfo::load_from(&mut cs)?;

block-util/src/queue/queue_diff.rs

@@ -2,6 +2,7 @@ use std::collections::BTreeMap;
 use std::sync::Arc;
 
 use anyhow::Result;
+use everscale_types::cell::Lazy;
 use everscale_types::error::Error;
 use everscale_types::models::*;
 use everscale_types::prelude::*;
@@ -247,7 +248,7 @@ impl Iterator for QueueDiffMessagesIter {
                 let ref_count = out_msg.descriptor().reference_count();
                 if ref_count > 0 {
                     if let Some(cell) = out_msg.reference_cloned(ref_count - 1) {
-                        return Some(Ok(Lazy::from_raw(cell)));
+                        return Some(Lazy::from_raw(cell));
                     }
                 }
 
@@ -282,7 +283,7 @@ mod tests {
     fn queue_diff_messages_iter() -> Result<()> {
         let mut out_messages = Dict::<HashBytes, (CurrencyCollection, OutMsg)>::new();
 
-        let dummy_tx = Lazy::from_raw(Cell::default());
+        let dummy_tx = Lazy::from_raw(Cell::default())?;
 
         // Fill with external messages
         for i in 0..10 {

block-util/src/state/shard_state_stuff.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use anyhow::Result;
+use everscale_types::cell::Lazy;
 use everscale_types::models::*;
 use everscale_types::prelude::*;
 
@@ -16,8 +17,8 @@ pub struct ShardStateStuff {
 impl ShardStateStuff {
     pub fn construct_split_root(left: Cell, right: Cell) -> Result<Cell> {
         CellBuilder::build_from(ShardStateSplit {
-            left: Lazy::from_raw(left),
-            right: Lazy::from_raw(right),
+            left: Lazy::from_raw(left)?,
+            right: Lazy::from_raw(right)?,
         })
         .map_err(From::from)
     }

cli/src/cmd/tools/gen_account.rs

@@ -179,7 +179,6 @@ impl WalletBuilder {
             last_trans_lt: 0,
             balance: self.balance.into(),
             state: AccountState::Active(state_init),
-            init_code_hash: None,
         };
 
         account.storage_stat.used = compute_storage_used(&account)?;
@@ -332,7 +331,6 @@ impl MultisigBuilder {
             last_trans_lt: 0,
             balance: self.balance.into(),
             state: AccountState::Active(state_init),
-            init_code_hash: None,
         };
 
         account.storage_stat.used = compute_storage_used(&account)?;

cli/src/cmd/tools/gen_zerostate.rs

@@ -3,6 +3,7 @@ use std::sync::OnceLock;
 
 use anyhow::{Context, Result};
 use everscale_crypto::ed25519;
+use everscale_types::cell::Lazy;
 use everscale_types::models::*;
 use everscale_types::num::Tokens;
 use everscale_types::prelude::*;
@@ -410,8 +411,6 @@ impl ZerostateConfig {
                 split_merge_at: None,
                 fees_collected: CurrencyCollection::ZERO,
                 funds_created: CurrencyCollection::ZERO,
-                copyleft_rewards: Dict::new(),
-                proof_chain: None,
             }));
         }
 
@@ -446,7 +445,6 @@ impl ZerostateConfig {
             last_key_block: None,
             block_create_stats: None,
             global_balance: state.total_balance.clone(),
-            copyleft_rewards: Dict::new(),
         })?);
 
         Ok(state)
@@ -852,7 +850,6 @@ fn build_config_account(
             data: Some(data),
             libraries: Dict::new(),
         }),
-        init_code_hash: None,
     };
 
     account.storage_stat.used = compute_storage_used(&account)?;
@@ -887,7 +884,6 @@ fn build_elector_code(address: &HashBytes, balance: Tokens) -> Result<Account> {
             data: Some(data),
             libraries: Dict::new(),
         }),
-        init_code_hash: None,
     };
 
     account.storage_stat.used = compute_storage_used(&account)?;

cli/src/util/jrpc_client.rs

@@ -123,11 +123,6 @@ where
             last_trans_lt: <_>::load_from(s)?,
             balance: <_>::load_from(s)?,
             state: <_>::load_from(s)?,
-            init_code_hash: if s.is_data_empty() {
-                None
-            } else {
-                Some(<_>::load_from(s)?)
-            },
         }))
     }
 

cli/src/util/mod.rs

@@ -41,9 +41,6 @@ pub fn compute_storage_used(account: &Account) -> Result<StorageUsed> {
         storage.store_u64(account.last_trans_lt)?;
         account.balance.store_into(&mut storage, cx)?;
         account.state.store_into(&mut storage, cx)?;
-        if account.init_code_hash.is_some() {
-            account.init_code_hash.store_into(&mut storage, cx)?;
-        }
         storage.build_ext(cx)?
     };
 

collator/Cargo.toml

@@ -36,7 +36,6 @@ thiserror = { workspace = true }
 tl-proto = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread", "signal"] }
 tokio-util = { workspace = true }
-ton_executor = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 trait-variant = { workspace = true }
@@ -45,6 +44,7 @@ trait-variant = { workspace = true }
 tycho-block-util = { workspace = true }
 tycho-consensus = { workspace = true }
 tycho-core = { workspace = true }
+tycho-executor = { workspace = true }
 tycho-network = { workspace = true }
 tycho-storage = { workspace = true }
 tycho-util = { workspace = true }