feat: integrate forc-wallet and forc-deploy

forc-plugins/forc-client/Cargo.toml

@@ -19,6 +19,7 @@ forc-pkg = { version = "0.42.0", path = "../../forc-pkg" }
 forc-tracing = { version = "0.42.0", path = "../../forc-tracing" }
 forc-tx = { version = "0.42.0", path = "../forc-tx" }
 forc-util = { version = "0.42.0", path = "../../forc-util" }
+forc-wallet = "0.2.3" 
 fuel-abi-types = "0.3"
 fuel-core-client = { workspace = true }
 fuel-crypto = { workspace = true }
@@ -29,6 +30,7 @@ fuels-core = { workspace = true }
 futures = "0.3"
 hex = "0.4.3"
 rand = "0.8"
+rpassword = "7.2"
 serde = "1.0"
 serde_json = "1"
 sway-core = { version = "0.42.0", path = "../../sway-core" }

forc-plugins/forc-client/src/cmd/deploy.rs

@@ -47,4 +47,7 @@ pub struct Command {
     pub unsigned: bool,
     /// Set the key to be used for signing.
     pub signing_key: Option<SecretKey>,
+    /// Sign the deployment transaction manually.
+    #[clap(long)]
+    pub manual_signing: bool,
 }

forc-plugins/forc-client/src/cmd/run.rs

@@ -51,4 +51,7 @@ pub struct Command {
     pub unsigned: bool,
     /// Set the key to be used for signing.
     pub signing_key: Option<SecretKey>,
+    /// Sign the deployment transaction manually.
+    #[clap(long)]
+    pub manual_signing: bool,
 }

forc-plugins/forc-client/src/op/deploy.rs

@@ -2,7 +2,7 @@ use crate::{
     cmd,
     util::{
         pkg::built_pkgs,
-        tx::{TransactionBuilderExt, TX_SUBMIT_TIMEOUT_MS},
+        tx::{TransactionBuilderExt, WalletSelectionMode, TX_SUBMIT_TIMEOUT_MS},
     },
 };
 use anyhow::{bail, Context, Result};
@@ -178,12 +178,23 @@ pub async fn deploy_pkg(
     let contract_id = contract.id(&salt, &root, &state_root);
     info!("Contract id: 0x{}", hex::encode(contract_id));
 
+    let wallet_mode = if command.manual_signing {
+        WalletSelectionMode::Manual
+    } else {
+        WalletSelectionMode::ForcWallet
+    };
+
     let tx = TransactionBuilder::create(bytecode.as_slice().into(), salt, storage_slots.clone())
         .gas_limit(command.gas.limit)
         .gas_price(command.gas.price)
         .maturity(command.maturity.maturity.into())
         .add_output(Output::contract_created(contract_id, state_root))
-        .finalize_signed(client.clone(), command.unsigned, command.signing_key)
+        .finalize_signed(
+            client.clone(),
+            command.unsigned,
+            command.signing_key,
+            wallet_mode,
+        )
         .await?;
 
     let tx = Transaction::from(tx);

forc-plugins/forc-client/src/op/run.rs

@@ -2,7 +2,7 @@ use crate::{
     cmd,
     util::{
         pkg::built_pkgs,
-        tx::{TransactionBuilderExt, TX_SUBMIT_TIMEOUT_MS},
+        tx::{TransactionBuilderExt, WalletSelectionMode, TX_SUBMIT_TIMEOUT_MS},
     },
 };
 use anyhow::{anyhow, bail, Context, Result};
@@ -77,12 +77,22 @@ pub async fn run_pkg(
                 .map_err(|e| anyhow!("Failed to parse contract id: {}", e))
         })
         .collect::<Result<Vec<ContractId>>>()?;
+    let wallet_mode = if command.manual_signing {
+        WalletSelectionMode::Manual
+    } else {
+        WalletSelectionMode::ForcWallet
+    };
     let tx = TransactionBuilder::script(compiled.bytecode.bytes.clone(), script_data)
         .gas_limit(command.gas.limit)
         .gas_price(command.gas.price)
         .maturity(command.maturity.maturity.into())
         .add_contracts(contract_ids)
-        .finalize_signed(client.clone(), command.unsigned, command.signing_key)
+        .finalize_signed(
+            client.clone(),
+            command.unsigned,
+            command.signing_key,
+            wallet_mode,
+        )
         .await?;
     if command.dry_run {
         info!("{:?}", tx);