Merge pull request #938 from everx-labs/IgorKoval/upd-deps

Upd deps

Cargo.toml

@@ -16,15 +16,16 @@ license = 'Apache-2.0'
 name = 'ever-cli'
 readme = 'README.md'
 repository = 'https://github.com/everx-labs/ever-cli'
-version = '0.38.0'
+version = '0.38.1'
 default-run = 'ever-cli'
 
 [dependencies]
 async-trait = '0.1.42'
 base64 = '0.13'
 chrono = '0.4'
 clap = '2.32'
-failure = '0.1'
+anyhow = '1.0'
+thiserror = '1.0'
 futures = '0.3'
 hex = '0.4'
 indicatif = '0.16'
@@ -42,14 +43,14 @@ serde = { features = [ 'derive' ], version = '1.0' }
 tokio = { default-features = false, features = [ 'full' ], version = '1.21' }
 url = '2.3.1'
 
-ever_abi = { git = 'https://github.com/everx-labs/ever-abi.git',  tag = '2.5.5' }
-ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.10.4' }
-ever_block_json = { git = 'https://github.com/everx-labs/ever-block-json.git', tag = '0.8.9' }
-ever_executor = { git = 'https://github.com/everx-labs/ever-executor.git', tag = '1.17.9' }
-ever_assembler = { git = 'https://github.com/everx-labs/ever-assembler.git', tag = '1.5.9' }
-ton_sdk = { git = 'https://github.com/everx-labs/ever-sdk.git', tag = '1.46.1' }
-ton_client = { git = 'https://github.com/everx-labs/ever-sdk.git', tag = '1.46.1' }
-ever_vm = { git = 'https://github.com/everx-labs/ever-vm.git', tag = '2.1.7' }
+ever_abi = { git = 'https://github.com/everx-labs/ever-abi.git',  tag = '2.6.2' }
+ever_block = { git = 'https://github.com/everx-labs/ever-block.git', tag = '1.11.1' }
+ever_block_json = { git = 'https://github.com/everx-labs/ever-block-json.git', tag = '0.9.4' }
+ever_executor = { git = 'https://github.com/everx-labs/ever-executor.git', tag = '1.18.2' }
+ever_assembler = { git = 'https://github.com/everx-labs/ever-assembler.git', tag = '1.6.4' }
+ever_sdk = { git = 'https://github.com/everx-labs/ever-sdk.git', tag = '1.47.0' }
+ever_client = { git = 'https://github.com/everx-labs/ever-sdk.git', tag = '1.47.0' }
+ever_vm = { git = 'https://github.com/everx-labs/ever-vm.git', tag = '2.2.2' }
 
 [dev-dependencies]
 assert_cmd = '2.0'
@@ -64,4 +65,3 @@ path = "src/main.rs"
 [[bin]]
 name = "__ever-cli_completion"
 path = "src/completion.rs"
-

README.md

@@ -2712,7 +2712,7 @@ $ echo $?
 
 ## 9.7. Make a raw GraphQL query
 
-The command `query-raw` executes a raw network query by directly calling the `ton_client::net::query_collection` SDK
+The command `query-raw` executes a raw network query by directly calling the `ever_client::net::query_collection` SDK
 interface.
 
 ```bash

src/account.rs

@@ -14,9 +14,9 @@ use std::sync::Arc;
 use crate::helpers::{check_dir, create_client_verbose, json_account, print_account, query_account_field};
 use crate::config::Config;
 use serde_json::{json, Value};
-use ton_client::error::ClientError;
-use ton_client::net::{ParamsOfQueryCollection, query_collection, ResultOfSubscription, ParamsOfSubscribeCollection};
-use ton_client::utils::{calc_storage_fee, ParamsOfCalcStorageFee};
+use ever_client::error::ClientError;
+use ever_client::net::{ParamsOfQueryCollection, query_collection, ResultOfSubscription, ParamsOfSubscribeCollection};
+use ever_client::utils::{calc_storage_fee, ParamsOfCalcStorageFee};
 use ever_block::{Account, Deserializable, Serializable};
 use crate::decode::print_account_data;
 
@@ -310,7 +310,7 @@ fn extract_last_trans_lt(v: &serde_json::Value) -> Option<&str> {
 pub async fn wait_for_change(config: &Config, account_address: &str, wait_secs: u64) -> Result<(), String> {
     let context = create_client_verbose(config)?;
 
-    let query = ton_client::net::query_collection(
+    let query = ever_client::net::query_collection(
         context.clone(),
         ParamsOfQueryCollection {
             collection: "accounts".to_owned(),
@@ -352,7 +352,7 @@ pub async fn wait_for_change(config: &Config, account_address: &str, wait_secs:
         }
     };
 
-    let subscription = ton_client::net::subscribe_collection(
+    let subscription = ever_client::net::subscribe_collection(
         context.clone(),
         ParamsOfSubscribeCollection {
             collection: "accounts".to_owned(),
@@ -376,7 +376,7 @@ pub async fn wait_for_change(config: &Config, account_address: &str, wait_secs:
     });
 
     let res = r.recv().await.ok_or_else(|| "Sender has dropped".to_owned())?;
-    ton_client::net::unsubscribe(context.clone(), subscription).await
+    ever_client::net::unsubscribe(context.clone(), subscription).await
         .map_err(|e| format!("Failed to unsubscribe: {}", e))?;
 
     if !config.is_json {

src/call.rs

@@ -15,17 +15,17 @@ use crate::convert;
 use crate::helpers::{TonClient, now_ms, create_client_verbose, load_abi, query_account_field,
     create_client, load_ton_abi, get_blockchain_config};
 
-use ton_client::abi::{encode_message, decode_message, ParamsOfDecodeMessage, ParamsOfEncodeMessage,
+use ever_client::abi::{encode_message, decode_message, ParamsOfDecodeMessage, ParamsOfEncodeMessage,
                       Abi};
-use ton_client::processing::{
+use ever_client::processing::{
     ParamsOfSendMessage,
     ParamsOfWaitForTransaction,
     ParamsOfProcessMessage,
     ProcessingEvent,
     wait_for_transaction,
     send_message,
 };
-use ton_client::tvm::{
+use ever_client::tvm::{
     run_executor,
     ParamsOfRunExecutor,
     AccountForExecutor
@@ -34,7 +34,7 @@ use ever_block::{Account, Serializable};
 use std::str::FromStr;
 use serde_json::{json, Value};
 use ever_abi::ParamType;
-use ton_client::error::ClientError;
+use ever_client::error::ClientError;
 use crate::debug::{init_debug_logger, debug_error, DebugParams};
 use crate::message::{EncodedMessage, prepare_message_params, print_encoded_message, unpack_message};
 
@@ -226,7 +226,7 @@ pub async fn process_message(
         }
     }};
     let res = if !config.is_json {
-        ton_client::processing::process_message(
+        ever_client::processing::process_message(
             ton.clone(),
             ParamsOfProcessMessage {
                 message_encode_params: msg.clone(),
@@ -236,7 +236,7 @@ pub async fn process_message(
             callback,
         ).await
     } else {
-        ton_client::processing::process_message(
+        ever_client::processing::process_message(
             ton.clone(),
             ParamsOfProcessMessage {
                 message_encode_params: msg.clone(),

src/completion.rs

@@ -16,7 +16,7 @@ extern crate core;
 use std::collections::BTreeMap;
 use std::path::PathBuf;
 use serde::{Deserialize, Serialize};
-use ton_client::abi::{AbiContract};
+use ever_client::abi::{AbiContract};
 
 #[derive(Serialize, Deserialize, Clone)]
 pub struct ContractData {

src/crypto.rs

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 use crate::helpers::{create_client_local, read_keys, WORD_COUNT, HD_PATH, check_dir};
-use ton_client::crypto::{
+use ever_client::crypto::{
     KeyPair,
     mnemonic_from_random,
     hdkey_xprv_from_mnemonic,

src/debot/callbacks.rs

@@ -18,9 +18,9 @@ use crate::helpers::TonClient;
 use std::collections::VecDeque;
 use std::io;
 use std::sync::{Arc, RwLock};
-use ton_client::crypto::SigningBoxHandle;
-use ton_client::debot::{BrowserCallbacks, DAction, DebotActivity, STATE_EXIT};
-use ton_client::error::ClientResult;
+use ever_client::crypto::SigningBoxHandle;
+use ever_client::debot::{BrowserCallbacks, DAction, DebotActivity, STATE_EXIT};
+use ever_client::error::ClientResult;
 
 #[derive(Default)]
 struct ActiveState {

src/debot/interfaces/address_input.rs

@@ -1,8 +1,8 @@
 use crate::debot::term_browser::terminal_input;
 use crate::helpers::load_ton_address;
 use serde_json::{Value, json};
-use ton_client::abi::Abi;
-use ton_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
 use super::dinterface::{decode_answer_id, decode_prompt};
 use crate::config::Config;
 

src/debot/interfaces/amount_input.rs

@@ -1,9 +1,9 @@
 use crate::debot::term_browser::terminal_input;
 use serde_json::{Value, json};
-use ton_client::abi::Abi;
-use ton_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
 use super::dinterface::{decode_answer_id, decode_num_arg, decode_prompt};
-use ton_client::encoding::decode_abi_number;
+use ever_client::encoding::decode_abi_number;
 use crate::convert;
 
 const ID: &str = "a1d347099e29c1624c8890619daf207bde18e92df5220a54bcc6d858309ece84";

src/debot/interfaces/confirm_input.rs

@@ -1,7 +1,7 @@
 use crate::debot::term_browser::terminal_input;
 use serde_json::{Value, json};
-use ton_client::abi::Abi;
-use ton_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
 use super::dinterface::{decode_answer_id, decode_prompt};
 
 const ID: &str = "16653eaf34c921467120f2685d425ff963db5cbb5aa676a62a2e33bfc3f6828a";

src/debot/interfaces/dinterface.rs

@@ -14,8 +14,8 @@ use std::collections::HashMap;
 use std::sync::Arc;
 use tokio::sync::RwLock;
 
-use ton_client::debot::{DebotInterface, DebotInterfaceExecutor};
-use ton_client::encoding::{decode_abi_bigint, decode_abi_number};
+use ever_client::debot::{DebotInterface, DebotInterfaceExecutor};
+use ever_client::encoding::{decode_abi_bigint, decode_abi_number};
 
 pub struct SupportedInterfaces {
     client: TonClient,

src/debot/interfaces/echo.rs

@@ -1,6 +1,6 @@
 use serde_json::{Value, json};
-use ton_client::debot::{DebotInterface, InterfaceResult};
-use ton_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::abi::Abi;
 
 const ECHO_ID: &str = "f6927c0d4bdb69e1b52d27f018d156ff04152f00558042ff674f0fec32e4369d";
 

src/debot/interfaces/encryption_box_input.rs

@@ -5,8 +5,8 @@ use crate::debot::term_encryption_box::{
 use crate::helpers::TonClient;
 use serde_json::{Value, json};
 use tokio::sync::RwLock;
-use ton_client::{abi::Abi, crypto::EncryptionBoxHandle};
-use ton_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::{abi::Abi, crypto::EncryptionBoxHandle};
+use ever_client::debot::{DebotInterface, InterfaceResult};
 
 const ID: &str = "5b5f76b54d976d72f1ada3063d1af2e5352edaf1ba86b3b311170d4d81056d61";
 

src/debot/interfaces/input_interface.rs

@@ -1,6 +1,6 @@
-use ton_client::abi::Abi;
+use ever_client::abi::Abi;
 use crate::debot::{ChainProcessor, ProcessorError};
-use ton_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::debot::{DebotInterface, InterfaceResult};
 use std::sync::{Arc};
 use tokio::sync::RwLock;
 use serde_json::{Value, json};

src/debot/interfaces/menu.rs

@@ -2,9 +2,9 @@ use super::dinterface::{decode_string_arg};
 use crate::debot::term_browser::{action_input};
 use serde_json::{Value, json};
 use serde::{de, Deserialize, Deserializer};
-use ton_client::abi::Abi;
-use ton_client::debot::{DebotInterface, InterfaceResult};
-use ton_client::encoding::decode_abi_number;
+use ever_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::encoding::decode_abi_number;
 
 pub(super) const ID: &str = "ac1a4d3ecea232e49783df4a23a81823cdca3205dc58cd20c4db259c25605b48";
 

src/debot/interfaces/number_input.rs

@@ -1,9 +1,9 @@
 use crate::debot::term_browser::terminal_input;
 use serde_json::{Value, json};
-use ton_client::abi::Abi;
-use ton_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
 use super::dinterface::{decode_answer_id, decode_int256, decode_prompt};
-use ton_client::encoding::decode_abi_bigint;
+use ever_client::encoding::decode_abi_bigint;
 
 const ID: &str = "c5a9558b2664aed7dc3e6123436d544f13ffe69ab0e259412f48c6d1c8588401";
 

src/debot/interfaces/signing_box_input.rs

@@ -1,9 +1,9 @@
 use super::dinterface::{decode_answer_id, decode_prompt, decode_array};
 
 use serde_json::Value;
-use ton_client::abi::Abi;
-use ton_client::debot::{DebotInterface, InterfaceResult};
-use ton_client::encoding::decode_abi_bigint;
+use ever_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::encoding::decode_abi_bigint;
 use crate::helpers::TonClient;
 use crate::debot::term_signing_box::TerminalSigningBox;
 use crate::debot::{ChainProcessor, ProcessorError};

src/debot/interfaces/stdout.rs

@@ -1,6 +1,6 @@
 use serde_json::{Value, json};
-use ton_client::debot::{DebotInterface, InterfaceResult};
-use ton_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::abi::Abi;
 
 const STDOUT_ID: &str = "c91dcc3fddb30485a3a07eb7c1e5e2aceaf75f4bc2678111de1f25291cdda80b";
 

src/debot/interfaces/terminal.rs

@@ -1,10 +1,10 @@
 use super::dinterface::{decode_answer_id, decode_bool_arg, decode_prompt, decode_string_arg, Printer};
 use crate::debot::term_browser::terminal_input;
 use serde_json::{Value, json};
-use ton_client::abi::Abi;
-use ton_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
 use crate::convert::convert_token;
-use ton_client::encoding::decode_abi_bigint;
+use ever_client::encoding::decode_abi_bigint;
 use std::io::{Read};
 
 pub(super) const ID: &str = "8796536366ee21852db56dccb60bc564598b618c865fc50c8b1ab740bba128e3";

src/debot/interfaces/userinfo.rs

@@ -3,8 +3,8 @@ use crate::config::Config;
 use crate::debot::term_signing_box::TerminalSigningBox;
 use crate::helpers::TonClient;
 use serde_json::{Value, json};
-use ton_client::abi::Abi;
-use ton_client::debot::{DebotInterface, InterfaceResult};
+use ever_client::abi::Abi;
+use ever_client::debot::{DebotInterface, InterfaceResult};
 
 const ID: &str = "a56115147709ed3437efb89460b94a120b7fe94379c795d1ebb0435a847ee580";
 

src/debot/processor.rs

@@ -1,8 +1,8 @@
 use serde_json::Value;
 use super::{ApproveKind, PipeChain, ChainLink};
 use std::vec::IntoIter;
-use ton_client::debot::DebotActivity;
-use ton_client::abi::{CallSet, Abi};
+use ever_client::debot::DebotActivity;
+use ever_client::abi::{CallSet, Abi};
 
 #[derive(Debug)]
 pub enum ProcessorError {

src/debot/term_browser.rs

@@ -16,10 +16,10 @@ use crate::helpers::{create_client, load_ton_address, load_abi, TonClient};
 use std::io::{self, BufRead, Write};
 use std::sync::Arc;
 use serde_json::json;
-use ton_client::abi::{ Abi, CallSet, ParamsOfEncodeInternalMessage, ParamsOfDecodeMessage,
+use ever_client::abi::{ Abi, CallSet, ParamsOfEncodeInternalMessage, ParamsOfDecodeMessage,
     encode_internal_message, decode_message};
-use ton_client::boc::{ParamsOfParse, parse_message};
-use ton_client::debot::{DebotInterfaceExecutor, DEngine, DebotInfo, DEBOT_WC};
+use ever_client::boc::{ParamsOfParse, parse_message};
+use ever_client::debot::{DebotInterfaceExecutor, DEngine, DebotInfo, DEBOT_WC};
 use std::collections::{HashMap, VecDeque};
 use super::{Callbacks, ChainLink, PipeChain, ChainProcessor, SupportedInterfaces};
 

src/debot/term_encryption_box.rs

@@ -2,7 +2,7 @@ use super::term_browser::input;
 use crate::crypto::load_keypair;
 use crate::helpers::{TonClient, HD_PATH};
 use std::io::{self};
-use ton_client::crypto::{
+use ever_client::crypto::{
     register_encryption_box, remove_encryption_box,
     EncryptionBoxHandle, RegisteredEncryptionBox, ChaCha20ParamsEB, ChaCha20EncryptionBox,
     NaclBoxParamsEB, NaclEncryptionBox, NaclSecretBoxParamsEB, NaclSecretEncryptionBox

src/debot/term_signing_box.rs

@@ -2,7 +2,7 @@ use super::term_browser::input;
 use crate::crypto::load_keypair;
 use crate::helpers::{read_keys, TonClient};
 use std::io::{self, BufRead, Write, Read, BufReader};
-use ton_client::crypto::{
+use ever_client::crypto::{
     get_signing_box, remove_signing_box, KeyPair, RegisteredSigningBox, SigningBoxHandle,
 };
 

src/debug.rs

@@ -14,8 +14,8 @@ use crate::{contract_data_from_matches_or_config_alias, FullConfig, print_args,
             unpack_alternative_params};
 use crate::message::prepare_message;
 use clap::{ArgMatches, SubCommand, Arg, App};
-use ton_client::boc::internal::deserialize_cell_from_base64;
-use ton_client::error::ClientError;
+use ever_client::boc::internal::deserialize_cell_from_base64;
+use ever_client::error::ClientError;
 use crate::config::Config;
 use crate::helpers::{load_ton_address, create_client, load_abi, now_ms, construct_account_from_tvc,
                      query_account_field, query_with_limit, create_client_verbose,
@@ -28,12 +28,12 @@ use std::io::{Write, BufRead};
 use std::collections::{HashSet, HashMap};
 use ever_block::{Message, Account, Serializable, Deserializable, Transaction, MsgAddressInt, CurrencyCollection, GasLimitsPrices, ConfigParamEnum, TransactionTickTock, InRefValue, TrComputePhase, CommonMessage};
 use ever_block::{UInt256, Cell, AccountId};
-use ton_client::abi::{CallSet, Signer, FunctionHeader, encode_message, ParamsOfEncodeMessage};
+use ever_client::abi::{CallSet, Signer, FunctionHeader, encode_message, ParamsOfEncodeMessage};
 use ever_executor::{
     BlockchainConfig, ExecuteParams, OrdinaryTransactionExecutor, TransactionExecutor, TickTockTransactionExecutor
 };
 use std::sync::{Arc, atomic::AtomicU64};
-use ton_client::net::{OrderBy, ParamsOfQueryCollection, query_collection, SortDirection};
+use ever_client::net::{OrderBy, ParamsOfQueryCollection, query_collection, SortDirection};
 use crate::crypto::load_keypair;
 use std::fmt;
 use std::fs::File;
@@ -1197,7 +1197,6 @@ pub async fn execute_debug(
     ).map_err(|e| {
         let exit_code = match e.downcast_ref() {
             Some(ever_executor::ExecutorError::NoAcceptError(exit_code, _)) => *exit_code,
-            Some(ever_executor::ExecutorError::TvmExceptionCode(exit_code)) => *exit_code as i32,
             None => ever_vm::error::tvm_exception_or_custom_code(&e),
             _ => return format!("Debug failed: {}", e)
         };