Update tycho-types and bump tycho-vm

Author: MrWad3r

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.0.1"
+version = "0.0.2"
 edition = "2021"
 authors = ["Broxus Team"]
 rust-version = "1.80.0"
@@ -20,7 +20,7 @@ members = [
 anyhow = "1.0"
 async-trait = "0.1"
 ed25519-dalek = "2.1"
-everscale-types = { git = "https://github.com/broxus/everscale-types.git", features = ["tycho", "abi"] }
+tycho-types = { version = "0.2", features = ["tycho", "abi"] }
 futures-util = "0.3"
 hex = { version = "0.4" }
 num-bigint = "0.4.6"
@@ -33,22 +33,21 @@ serde = "1.0"
 serde_json = "1.0"
 thiserror = "2.0"
 tokio = { version = "1", features = ["sync", "time"] }
-tl-proto = "0.5.3"
 
 case = "1.0.0"
 proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "2.0", features = ["visit", "parsing"] }
 
-tycho-executor = { git = "https://github.com/broxus/tycho-vm.git"}
-tycho-vm = { git = "https://github.com/broxus/tycho-vm.git" }
+tycho-executor = "0.2"
+tycho-vm = "0.2"
 
 # local deps
 nekoton-core = { path = "./core" }
 nekoton-transport = { path = "./transport" }
 nekoton-utils = { path = "./utils" }
 nekoton-proc =  { path = "./proc" }
 
-[patch.crates-io]
-everscale-types = { git = "https://github.com/broxus/everscale-types.git" }
+#[patch.crates-io]
+#everscale-types = { git = "https://github.com/broxus/everscale-types.git" }
 

core/Cargo.toml

@@ -11,8 +11,7 @@ license.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-ed25519-dalek = { workspace = true }
-everscale-types = { workspace = true }
+tycho-types = { workspace = true }
 futures-util = { workspace = true }
 num-bigint = {workspace = true}
 num-traits = {workspace = true}
@@ -21,7 +20,7 @@ serde = { workspace = true }
 tokio = { workspace = true }
 thiserror = {workspace = true}
 tycho-executor = {workspace = true}
-tycho-vm = {workspace = true, features = ["tracing"]}
+tycho-vm = { workspace = true, features = ["tracing"]}
 
 
 # local deps

core/src/contracts/blockchain_context.rs

@@ -3,16 +3,16 @@ use std::sync::Arc;
 use crate::error::ExecutionError;
 use crate::models::{ContractState, GenTimings};
 use crate::transport::Transport;
-use everscale_types::abi::{Function, NamedAbiValue};
-use everscale_types::crc::crc_16;
-use everscale_types::models::{
-    Account, BlockchainConfig, ExtInMsgInfo, IntAddr, IntMsgInfo, MsgInfo, OwnedMessage, StdAddr,
-    Transaction,
-};
-use everscale_types::prelude::{Cell, CellBuilder, CellFamily, DynCell};
 use nekoton_utils::time::{Clock, SimpleClock};
 use num_bigint::BigInt;
 use tycho_executor::ExecutorParams;
+use tycho_types::abi::{Function, NamedAbiValue};
+use tycho_types::crc::crc_16;
+use tycho_types::models::{
+    Account, BlockchainConfig, ExtInMsgInfo, IntAddr, IntMsgInfo, MsgInfo, OwnedMessage, StdAddr,
+    Transaction,
+};
+use tycho_types::prelude::{Cell, CellBuilder, CellFamily, DynCell};
 use tycho_vm::{BehaviourModifiers, OwnedCellSlice, RcStackValue, SafeRc};
 
 use super::function_ext::{ExecutionOutput, FunctionExt};

core/src/contracts/function_ext.rs

@@ -1,8 +1,8 @@
-use everscale_types::abi::{AbiType, AbiValue, Function, NamedAbiValue};
-use everscale_types::models::{Account, RelaxedMsgInfo};
-use everscale_types::num::Tokens;
 use num_traits::cast::ToPrimitive;
 use tycho_executor::ParsedConfig;
+use tycho_types::abi::{AbiType, AbiValue, Function, NamedAbiValue};
+use tycho_types::models::{Account, RelaxedMsgInfo};
+use tycho_types::num::Tokens;
 use tycho_vm::OwnedCellSlice;
 
 use super::blockchain_context::{BlockchainContext, MessageBuilder};

core/src/contracts/local_executor.rs

@@ -1,13 +1,13 @@
-use everscale_types::cell::{Cell, CellBuilder};
-use everscale_types::models::{
+use tycho_types::cell::{Cell, CellBuilder};
+use tycho_types::models::{
     Account, ComputePhase, IntAddr, MsgType, OutAction, OutActionsRevIter, OwnedMessage,
     OwnedRelaxedMessage, ShardAccount, Transaction,
 };
-use everscale_types::prelude::{CellFamily, Store};
+use tycho_types::prelude::{CellFamily, Store};
 
-use everscale_types::num::Tokens;
 use tycho_executor::phase::{ComputePhaseContext, TransactionInput};
 use tycho_executor::{ExecutorParams, ParsedConfig};
+use tycho_types::num::Tokens;
 use tycho_vm::OwnedCellSlice;
 
 use crate::error::ExecutionError;
@@ -85,6 +85,6 @@ pub fn execute_ordinary_transaction(
 
     let executor = tycho_executor::Executor::new(executor_params, config);
     let uncommited = executor.begin_ordinary(address, is_external, message, shard_account)?;
-    let tx = uncommited.build_uncommited()?;
+    let tx = uncommited.build_uncommitted()?;
     Ok(tx)
 }

core/src/contracts/local_vm.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
-use everscale_types::cell::HashBytes;
-use everscale_types::models::{Account, AccountState, BlockchainConfig, LibDescr};
-use everscale_types::prelude::Dict;
+use tycho_types::cell::HashBytes;
+use tycho_types::models::{Account, AccountState, BlockchainConfig, LibDescr};
+use tycho_types::prelude::Dict;
 use tycho_vm::{
     BehaviourModifiers, GasParams, RcStackValue, SmcInfoBase, SmcInfoTonV6, UnpackedConfig,
     VmStateBuilder,
@@ -89,7 +89,7 @@ impl LocalVm {
             .require_ton_v4()
             .require_ton_v6()
             .with_unpacked_config(self.config.clone().into_tuple())
-            .require_ton_v9();
+            .require_ton_v11();
 
         let data = state.clone().data.unwrap_or_default();
 

core/src/contracts/mod.rs

@@ -8,15 +8,15 @@ pub mod utils;
 pub mod tests {
     use crate::contracts::blockchain_context::BlockchainContextBuilder;
     use crate::transport::SimpleTransport;
-    use everscale_types::abi::{AbiHeaderType, AbiType, AbiValue, AbiVersion, Function};
-    use everscale_types::boc::Boc;
-    use everscale_types::models::{
-        BlockchainConfig, IntAddr, SizeLimitsConfig, StdAddr, StdAddrFormat,
-    };
-    use everscale_types::prelude::{CellBuilder, Load};
     use num_bigint::BigUint;
     use num_traits::Zero;
     use std::sync::Arc;
+    use tycho_types::abi::{AbiHeaderType, AbiType, AbiValue, AbiVersion, Function};
+    use tycho_types::boc::Boc;
+    use tycho_types::models::{
+        BlockchainConfig, IntAddr, SizeLimitsConfig, StdAddr, StdAddrFormat,
+    };
+    use tycho_types::prelude::{CellBuilder, Load};
     use tycho_vm::{tuple, OwnedCellSlice, SafeRc};
 
     #[test]

core/src/contracts/utils.rs

@@ -1,7 +1,7 @@
 use crate::models::GenTimings;
-use everscale_types::abi::{AbiValue, NamedAbiValue};
 use nekoton_utils::time::Clock;
 use num_bigint::BigUint;
+use tycho_types::abi::{AbiValue, NamedAbiValue};
 
 const ANSWER_ID: &str = "_answer_id";
 pub fn answer_id() -> NamedAbiValue {

core/src/error.rs

@@ -1,5 +1,5 @@
-use everscale_types::abi::AbiType;
-use everscale_types::models::{ComputePhaseSkipReason, IntAddr};
+use tycho_types::abi::AbiType;
+use tycho_types::models::{ComputePhaseSkipReason, IntAddr};
 
 #[derive(thiserror::Error, Debug)]
 pub enum ExecutionError {
@@ -23,7 +23,7 @@ pub enum ExecutionError {
     TransactionError(#[from] tycho_executor::TxError),
 
     #[error("Cell error: {0}")]
-    CellError(#[from] everscale_types::error::Error),
+    CellError(#[from] tycho_types::error::Error),
     #[error("Error: {0}")]
     Other(#[from] anyhow::Error),
 }

core/src/lib.rs

@@ -3,4 +3,3 @@ mod error;
 pub mod models;
 pub mod transactions;
 pub mod transport;
-mod message;