near · frol · Jun 5, 2023 · May 30, 2023 · May 30, 2023 · May 31, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,8 +61,8 @@ near-primitives = "0.16.1"
 near-jsonrpc-client = "0.5.1"
 near-jsonrpc-primitives = "0.16.1"
 
-interactive-clap = "0.2.2"
-interactive-clap-derive = "0.2.2"
+interactive-clap = "0.2.4"
+interactive-clap-derive = "0.2.4"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 security-framework = "2.7.0"

diff --git a/docs/GUIDE.en.md b/docs/GUIDE.en.md
@@ -5,7 +5,17 @@ overview of its capabilities. This guide assumes that _near CLI_ is
 [installed](README.md#installation)
 and that readers have passing familiarity with using command line tools. This
 also assumes a Unix-like system, although most commands are probably easily
-translatable to any command line shell environment.
+translatable to any command line shell environment.  
+
+With _near CLI_ you can create, sign and send transactions in _online_ mode, which is enabled by default.
+In _offline_ mode, you can create and sign a transaction. The base64 encoding transaction can be sent later (even from another computer). To enter the _offline_ mode, you need to set the ```--offline``` flag in the command: 
+```txt
+near --offline tokens \
+    fro_volod.testnet \
+    send-near volodymyr.testnet 0.1NEAR \
+    network-config testnet \
+    sign-later
+```
 
 Before proceeding to the description of specific commands, it is necessary to consider two points common to these commands:
 
@@ -49,6 +59,10 @@ Before proceeding to the description of specific commands, it is necessary to co
 
         When choosing this signature option, _near CLI_ will ask the user to enter the mnemonic phrase associated with the account.
 
+    - _sign-later - Prepare unsigned transaction (we'll use base64 encoding to simplify copy-pasting)_
+
+        This option involves signing the created transaction later.
+
 2. Actions with a signed transaction
 
    _near CLI_ support for meta transactions as specified in [NEP-366](https://near.github.io/nearcore/architecture/how/meta-tx.html#meta-transactions). To create it, you just need to specify a _network_ that supports meta transactions. You can find out about such support in [config](#show-connections---Show-a-list-of-network-connections). The *meta_transaction_relayer_url* field is responsible for the ability to support meta transactions. For example:  

diff --git a/docs/GUIDE.ru.md b/docs/GUIDE.ru.md
@@ -3,8 +3,17 @@
 Это руководство предназначено для того, чтобы дать подробное описание утилиты _near CLI_ и
 обзор её возможностей. Предполагается, что утилита _near CLI_
 [установлена](README.ru.md#installation)
-и пользователи знакомы с использованием инструментов командной строки. Также предполагается Unix-подобная система, хотя большинство команд, вероятно, легко
-переводимы в любую среду оболочки командной строки.
+и пользователи знакомы с использованием инструментов командной строки. Также предполагается Unix-подобная система, хотя большинство команд, вероятно, легко переводимы в любую среду оболочки командной строки.  
+
+Спомощью _near CLI_ можно создать, подписать и отправить транзакцию в режиме _online_, который включен по умолчанию.
+В режиме _offline_ можно создать и подписать транзакцию. Транзакция, кодированная в base64 может быть отправлена позже (даже с другого компьютера). Для входа в режим _offline_ необходимо в команде установить флаг ```--offline```:  
+```txt
+near --offline tokens \
+    fro_volod.testnet \
+    send-near volodymyr.testnet 0.1NEAR \
+    network-config testnet \
+    sign-later
+```
 
 Прежде, чем перейти к описанию конкретных команд, необходимо рассмотреть два общих для этих команд пункта:
 
@@ -47,6 +56,10 @@
 
         При выборе этого варианта подписи _near CLI_ попросит пользователя ввести мнемоническую фразу, связанную с аккаунтом.
 
+    - _sign-later - Prepare unsigned transaction (we'll use base64 encoding to simplify copy-pasting)_
+
+        Этот вариант предполагает подписание созданной транзакции позже.
+
 2. Действия с подписанной транзакцией
 
     _near CLI_ поддерживает мета-транзакции, описанные в спецификации [NEP-366](https://near.github.io/nearcore/architecture/how/meta-tx.html#meta-transactions). Для её создания достаточно указать _network_, поддерживающую мета-транзакции. Узнать о такой поддержке можно в [конфигурационном файле](#show-connections---Show-a-list-of-network-connections). За возможность поддержки мета-транзакции отвечает поле *meta_transaction_relayer_url*. Например:  

diff --git a/src/commands/account/add_key/access_key_type/mod.rs b/src/commands/account/add_key/access_key_type/mod.rs
@@ -4,7 +4,7 @@ use inquire::{CustomType, Select, Text};
 
 #[derive(Debug, Clone)]
 pub struct AccessTypeContext {
-    pub config: crate::config::Config,
+    pub global_context: crate::GlobalContext,
     pub signer_account_id: near_primitives::types::AccountId,
     pub permission: near_primitives::account::AccessKeyPermission,
 }
@@ -19,7 +19,7 @@ pub struct FullAccessType {
 
 #[derive(Debug, Clone)]
 pub struct FullAccessTypeContext {
-    config: crate::config::Config,
+    global_context: crate::GlobalContext,
     signer_account_id: near_primitives::types::AccountId,
     permission: near_primitives::account::AccessKeyPermission,
 }
@@ -30,7 +30,7 @@ impl FullAccessTypeContext {
         _scope: &<FullAccessType as interactive_clap::ToInteractiveClapContextScope>::InteractiveClapContextScope,
     ) -> color_eyre::eyre::Result<Self> {
         Ok(Self {
-            config: previous_context.config,
+            global_context: previous_context.global_context,
             signer_account_id: previous_context.owner_account_id.into(),
             permission: near_primitives::account::AccessKeyPermission::FullAccess,
         })
@@ -40,7 +40,7 @@ impl FullAccessTypeContext {
 impl From<FullAccessTypeContext> for AccessTypeContext {
     fn from(item: FullAccessTypeContext) -> Self {
         Self {
-            config: item.config,
+            global_context: item.global_context,
             signer_account_id: item.signer_account_id,
             permission: item.permission,
         }
@@ -67,7 +67,7 @@ pub struct FunctionCallType {
 
 #[derive(Debug, Clone)]
 pub struct FunctionCallTypeContext {
-    config: crate::config::Config,
+    global_context: crate::GlobalContext,
     signer_account_id: near_primitives::types::AccountId,
     allowance: Option<crate::common::NearBalance>,
     receiver_account_id: crate::types::account_id::AccountId,
@@ -80,7 +80,7 @@ impl FunctionCallTypeContext {
         scope: &<FunctionCallType as interactive_clap::ToInteractiveClapContextScope>::InteractiveClapContextScope,
     ) -> color_eyre::eyre::Result<Self> {
         Ok(Self {
-            config: previous_context.config,
+            global_context: previous_context.global_context,
             signer_account_id: previous_context.owner_account_id.into(),
             allowance: scope.allowance.clone(),
             receiver_account_id: scope.receiver_account_id.clone(),
@@ -92,7 +92,7 @@ impl FunctionCallTypeContext {
 impl From<FunctionCallTypeContext> for AccessTypeContext {
     fn from(item: FunctionCallTypeContext) -> Self {
         Self {
-            config: item.config,
+            global_context: item.global_context,
             signer_account_id: item.signer_account_id,
             permission: near_primitives::account::AccessKeyPermission::FunctionCall(
                 near_primitives::account::FunctionCallPermission {

diff --git a/src/commands/account/add_key/autogenerate_new_keypair/mod.rs b/src/commands/account/add_key/autogenerate_new_keypair/mod.rs
@@ -16,7 +16,7 @@ pub struct GenerateKeypair {
 
 #[derive(Debug, Clone)]
 pub struct GenerateKeypairContext {
-    config: crate::config::Config,
+    global_context: crate::GlobalContext,
     signer_account_id: near_primitives::types::AccountId,
     permission: near_primitives::account::AccessKeyPermission,
     key_pair_properties: crate::common::KeyPairProperties,
@@ -32,7 +32,7 @@ impl GenerateKeypairContext {
             crate::common::generate_keypair()?;
         let public_key = near_crypto::PublicKey::from_str(&key_pair_properties.public_key_str)?;
         Ok(Self {
-            config: previous_context.config,
+            global_context: previous_context.global_context,
             signer_account_id: previous_context.signer_account_id,
             permission: previous_context.permission,
             key_pair_properties,

diff --git a/src/commands/account/add_key/autogenerate_new_keypair/print_keypair_to_terminal/mod.rs b/src/commands/account/add_key/autogenerate_new_keypair/print_keypair_to_terminal/mod.rs
@@ -9,7 +9,7 @@ pub struct PrintKeypairToTerminal {
 
 #[derive(Debug, Clone)]
 pub struct PrintKeypairToTerminalContext {
-    config: crate::config::Config,
+    global_context: crate::GlobalContext,
     signer_account_id: near_primitives::types::AccountId,
     permission: near_primitives::account::AccessKeyPermission,
     key_pair_properties: crate::common::KeyPairProperties,
@@ -22,7 +22,7 @@ impl PrintKeypairToTerminalContext {
         _scope: &<PrintKeypairToTerminal as interactive_clap::ToInteractiveClapContextScope>::InteractiveClapContextScope,
     ) -> color_eyre::eyre::Result<Self> {
         Ok(Self {
-            config: previous_context.config,
+            global_context: previous_context.global_context,
             signer_account_id: previous_context.signer_account_id,
             permission: previous_context.permission,
             key_pair_properties: previous_context.key_pair_properties,
@@ -50,7 +50,7 @@ impl From<PrintKeypairToTerminalContext> for crate::commands::ActionContext {
                 })
             });
         Self {
-            config: item.config,
+            global_context: item.global_context,
             on_after_getting_network_callback,
             on_before_signing_callback: std::sync::Arc::new(
                 |_prepolulated_unsinged_transaction, _network_config| Ok(()),

diff --git a/src/commands/account/add_key/autogenerate_new_keypair/save_keypair_to_keychain/mod.rs b/src/commands/account/add_key/autogenerate_new_keypair/save_keypair_to_keychain/mod.rs
@@ -11,7 +11,7 @@ pub struct SaveKeypairToKeychain {
 
 #[derive(Debug, Clone)]
 pub struct SaveKeypairToKeychainContext {
-    config: crate::config::Config,
+    global_context: crate::GlobalContext,
     signer_account_id: near_primitives::types::AccountId,
     permission: near_primitives::account::AccessKeyPermission,
     key_pair_properties: crate::common::KeyPairProperties,
@@ -24,7 +24,7 @@ impl SaveKeypairToKeychainContext {
         _scope: &<SaveKeypairToKeychain as interactive_clap::ToInteractiveClapContextScope>::InteractiveClapContextScope,
     ) -> color_eyre::eyre::Result<Self> {
         Ok(Self {
-            config: previous_context.config,
+            global_context: previous_context.global_context,
             signer_account_id: previous_context.signer_account_id,
             permission: previous_context.permission,
             key_pair_properties: previous_context.key_pair_properties,
@@ -35,7 +35,7 @@ impl SaveKeypairToKeychainContext {
 
 impl From<SaveKeypairToKeychainContext> for crate::commands::ActionContext {
     fn from(item: SaveKeypairToKeychainContext) -> Self {
-        let credentials_home_dir = item.config.credentials_home_dir.clone();
+        let credentials_home_dir = item.global_context.config.credentials_home_dir.clone();
 
         let on_after_getting_network_callback: crate::commands::OnAfterGettingNetworkCallback =
             std::sync::Arc::new(move |_network_config| {
@@ -76,7 +76,7 @@ impl From<SaveKeypairToKeychainContext> for crate::commands::ActionContext {
             );
 
         Self {
-            config: item.config,
+            global_context: item.global_context,
             on_after_getting_network_callback,
             on_before_signing_callback: std::sync::Arc::new(
                 |_prepolulated_unsinged_transaction, _network_config| Ok(()),

diff --git a/src/commands/account/add_key/autogenerate_new_keypair/save_keypair_to_macos_keychain/mod.rs b/src/commands/account/add_key/autogenerate_new_keypair/save_keypair_to_macos_keychain/mod.rs
@@ -50,7 +50,7 @@ impl From<SaveKeypairToMacosKeychainContext> for crate::commands::ActionContext
                 },
             );
         Self {
-            config: item.0.config,
+            global_context: item.0.global_context,
             on_after_getting_network_callback,
             on_before_signing_callback: std::sync::Arc::new(
                 |_prepolulated_unsinged_transaction, _network_config| Ok(()),

diff --git a/src/commands/account/add_key/mod.rs b/src/commands/account/add_key/mod.rs
@@ -19,7 +19,7 @@ pub struct AddKeyCommand {
 
 #[derive(Debug, Clone)]
 pub struct AddKeyCommandContext {
-    config: crate::config::Config,
+    global_context: crate::GlobalContext,
     owner_account_id: crate::types::account_id::AccountId,
 }
 
@@ -29,7 +29,7 @@ impl AddKeyCommandContext {
         scope: &<AddKeyCommand as interactive_clap::ToInteractiveClapContextScope>::InteractiveClapContextScope,
     ) -> color_eyre::eyre::Result<Self> {
         Ok(Self {
-            config: previous_context.0,
+            global_context: previous_context,
             owner_account_id: scope.owner_account_id.clone(),
         })
     }

diff --git a/src/commands/account/add_key/use_ledger/mod.rs b/src/commands/account/add_key/use_ledger/mod.rs
@@ -9,7 +9,7 @@ pub struct AddLedgerKeyAction {
 
 #[derive(Debug, Clone)]
 pub struct AddLedgerKeyActionContext {
-    config: crate::config::Config,
+    global_context: crate::GlobalContext,
     signer_account_id: near_primitives::types::AccountId,
     permission: near_primitives::account::AccessKeyPermission,
     public_key: crate::types::public_key::PublicKey,
@@ -38,7 +38,7 @@ impl AddLedgerKeyActionContext {
         ));
 
         Ok(Self {
-            config: previous_context.config,
+            global_context: previous_context.global_context,
             signer_account_id: previous_context.signer_account_id,
             permission: previous_context.permission,
             public_key: public_key.into(),
@@ -65,7 +65,7 @@ impl From<AddLedgerKeyActionContext> for crate::commands::ActionContext {
                 })
             });
         Self {
-            config: item.config,
+            global_context: item.global_context,
             on_after_getting_network_callback,
             on_before_signing_callback: std::sync::Arc::new(
                 |_prepolulated_unsinged_transaction, _network_config| Ok(()),

diff --git a/src/commands/account/add_key/use_manually_provided_seed_phrase/mod.rs b/src/commands/account/add_key/use_manually_provided_seed_phrase/mod.rs
@@ -13,7 +13,7 @@ pub struct AddAccessWithSeedPhraseAction {
 
 #[derive(Debug, Clone)]
 pub struct AddAccessWithSeedPhraseActionContext {
-    config: crate::config::Config,
+    global_context: crate::GlobalContext,
     signer_account_id: near_primitives::types::AccountId,
     permission: near_primitives::account::AccessKeyPermission,
     public_key: near_crypto::PublicKey,
@@ -30,7 +30,7 @@ impl AddAccessWithSeedPhraseActionContext {
             &scope.master_seed_phrase,
         )?;
         Ok(Self {
-            config: previous_context.config,
+            global_context: previous_context.global_context,
             signer_account_id: previous_context.signer_account_id,
             permission: previous_context.permission,
             public_key,
@@ -57,7 +57,7 @@ impl From<AddAccessWithSeedPhraseActionContext> for crate::commands::ActionConte
                 })
             });
         Self {
-            config: item.config,
+            global_context: item.global_context,
             on_after_getting_network_callback,
             on_before_signing_callback: std::sync::Arc::new(
                 |_prepolulated_unsinged_transaction, _network_config| Ok(()),

diff --git a/src/commands/account/add_key/use_public_key/mod.rs b/src/commands/account/add_key/use_public_key/mod.rs
@@ -11,7 +11,7 @@ pub struct AddAccessKeyAction {
 
 #[derive(Debug, Clone)]
 pub struct AddAccessKeyActionContext {
-    config: crate::config::Config,
+    global_context: crate::GlobalContext,
     signer_account_id: near_primitives::types::AccountId,
     permission: near_primitives::account::AccessKeyPermission,
     public_key: crate::types::public_key::PublicKey,
@@ -23,7 +23,7 @@ impl AddAccessKeyActionContext {
         scope: &<AddAccessKeyAction as interactive_clap::ToInteractiveClapContextScope>::InteractiveClapContextScope,
     ) -> color_eyre::eyre::Result<Self> {
         Ok(Self {
-            config: previous_context.config,
+            global_context: previous_context.global_context,
             signer_account_id: previous_context.signer_account_id,
             permission: previous_context.permission,
             public_key: scope.public_key.clone(),
@@ -50,7 +50,7 @@ impl From<AddAccessKeyActionContext> for crate::commands::ActionContext {
                 })
             });
         Self {
-            config: item.config,
+            global_context: item.global_context,
             on_after_getting_network_callback,
             on_before_signing_callback: std::sync::Arc::new(
                 |_prepolulated_unsinged_transaction, _network_config| Ok(()),

diff --git a/src/commands/account/create_account/create_implicit_account/use_auto_generation.rs b/src/commands/account/create_account/create_implicit_account/use_auto_generation.rs
@@ -48,7 +48,7 @@ impl SaveWithUseAutoGenerationContext {
                 }
             });
         Ok(Self(super::SaveImplicitAccountContext {
-            config: previous_context.0,
+            config: previous_context.config,
             on_after_getting_folder_path_callback,
         }))
     }

diff --git a/src/commands/account/create_account/create_implicit_account/use_ledger.rs b/src/commands/account/create_account/create_implicit_account/use_ledger.rs
@@ -61,7 +61,7 @@ impl SaveWithLedgerContext {
                 }
             });
         Ok(Self(super::SaveImplicitAccountContext {
-            config: previous_context.0,
+            config: previous_context.config,
             on_after_getting_folder_path_callback,
         }))
     }

diff --git a/src/commands/account/create_account/create_implicit_account/use_seed_phrase.rs b/src/commands/account/create_account/create_implicit_account/use_seed_phrase.rs
@@ -59,7 +59,7 @@ impl SaveWithSeedPhraseContext {
                 }
             });
         Ok(Self(super::SaveImplicitAccountContext {
-            config: previous_context.0,
+            config: previous_context.config,
             on_after_getting_folder_path_callback,
         }))
     }