Merge branch 'master' into kayagokalp/deploy-default-proxy

Author: sdankel

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

@@ -34,6 +34,7 @@ use std::{
     sync::Arc,
     time::Duration,
 };
+use std::{sync::Arc, time::Duration};
 use sway_core::language::parsed::TreeType;
 use sway_core::BuildTarget;
 
@@ -381,7 +382,6 @@ pub async fn deploy_pkg(
     let manifest = &compiled.descriptor.manifest_file;
     let node_url = provider.url();
     let client = FuelClient::new(node_url)?;
-
     let bytecode = &compiled.bytecode.bytes;
 
     let mut storage_slots =

forc-plugins/forc-client/src/util/tx.rs

@@ -121,13 +121,6 @@ pub(crate) fn secret_key_from_forc_wallet(
     Ok(secret_key)
 }
 
-pub(crate) fn bech32_from_secret(secret_key: &SecretKey) -> Result<Bech32Address> {
-    let public_key = PublicKey::from(secret_key);
-    let hashed = public_key.hash();
-    let bech32 = Bech32Address::new(FUEL_BECH32_HRP, hashed);
-    Ok(bech32)
-}
-
 pub(crate) fn select_manual_secret_key(
     default_signer: bool,
     signing_key: Option<SecretKey>,

forc-plugins/forc-client/test/data/contract_with_dep/Forc.lock

@@ -0,0 +1,19 @@
+[[package]]
+name = "contract_with_dep"
+source = "member"
+dependencies = ["std"]
+contract-dependencies = ["standalone_contract (0000000000000000000000000000000000000000000000000000000000000001)"]
+
+[[package]]
+name = "core"
+source = "path+from-root-9B9D657E3F1FCA11"
+
+[[package]]
+name = "standalone_contract"
+source = "path+from-root-9B9D657E3F1FCA11"
+dependencies = ["std"]
+
+[[package]]
+name = "std"
+source = "path+from-root-9B9D657E3F1FCA11"
+dependencies = ["core"]

forc-plugins/forc-client/test/data/standalone_contract/Forc.lock

@@ -0,0 +1,13 @@
+[[package]]
+name = "core"
+source = "path+from-root-79BB3EA8498403DE"
+
+[[package]]
+name = "standalone_contract"
+source = "member"
+dependencies = ["std"]
+
+[[package]]
+name = "std"
+source = "path+from-root-79BB3EA8498403DE"
+dependencies = ["core"]