feat: add forc contract-id and forc predicate-id commands (FuelLa…

…bs#4338)

## Description
Adds `forc contract-id` and `forc predicate-id` commands for contract id and predicate root detection.

closes FuelLabs#3444.

docs/book/src/SUMMARY.md

@@ -68,10 +68,12 @@
     - [forc check](./forc/commands/forc_check.md)
     - [forc clean](./forc/commands/forc_clean.md)
     - [forc completions](./forc/commands/forc_completions.md)
+    - [forc contract-id](./forc/commands/forc_contract-id.md)
     - [forc init](./forc/commands/forc_init.md)
     - [forc new](./forc/commands/forc_new.md)
     - [forc parse-bytecode](./forc/commands/forc_parse-bytecode.md)
     - [forc plugins](./forc/commands/forc_plugins.md)
+    - [forc predicate-root](./forc/commands/forc_predicate-root.md)
     - [forc test](./forc/commands/forc_test.md)
     - [forc update](./forc/commands/forc_update.md)
     - [forc template](./forc/commands/forc_template.md)

docs/book/src/forc/commands/forc_contract-id.md

@@ -0,0 +1 @@
+# forc contract-id

docs/book/src/forc/commands/forc_predicate-root.md

@@ -0,0 +1 @@
+# forc predicate-root

forc-pkg/src/pkg.rs

@@ -326,7 +326,7 @@ impl Default for MemberFilter {
 }
 
 impl MemberFilter {
-    /// Returns a new `BuildFilter` that only builds scripts.
+    /// Returns a new `MemberFilter` that only builds scripts.
     pub fn only_scripts() -> Self {
         Self {
             build_contracts: false,
@@ -336,7 +336,7 @@ impl MemberFilter {
         }
     }
 
-    /// Returns a new `BuildFilter` that only builds contracts.
+    /// Returns a new `MemberFilter` that only builds contracts.
     pub fn only_contracts() -> Self {
         Self {
             build_contracts: true,
@@ -346,7 +346,17 @@ impl MemberFilter {
         }
     }
 
-    /// Filter given target of output nodes according to the this `BuildFilter`.
+    /// Returns a new `MemberFilter`, that only builds predicates.
+    pub fn only_predicates() -> Self {
+        Self {
+            build_contracts: false,
+            build_scripts: false,
+            build_predicates: true,
+            build_libraries: false,
+        }
+    }
+
+    /// Filter given target of output nodes according to the this `MemberFilter`.
     pub fn filter_outputs(
         &self,
         build_plan: &BuildPlan,
@@ -756,6 +766,24 @@ impl BuildPlan {
                 .map(|(n, p)| (n.clone(), p.clone()))
         })
     }
+
+    /// Returns a salt for the given pinned package if it is a contract and `None` for libraries.
+    pub fn salt(&self, pinned: &Pinned) -> Option<fuel_tx::Salt> {
+        let graph = self.graph();
+        let node_ix = graph
+            .node_indices()
+            .find(|node_ix| graph[*node_ix] == *pinned);
+        node_ix.and_then(|node| {
+            graph
+                .edges_directed(node, Direction::Incoming)
+                .map(|e| match e.weight().kind {
+                    DepKind::Library => None,
+                    DepKind::Contract { salt } => Some(salt),
+                })
+                .next()
+                .flatten()
+        })
+    }
 }
 
 impl Programs {

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

@@ -2,7 +2,8 @@ use clap::Parser;
 use fuel_crypto::SecretKey;
 
 pub use forc::cli::shared::{BuildOutput, BuildProfile, Minify, Pkg, Print};
-pub use forc_tx::{Gas, Maturity, Salt};
+pub use forc_tx::{Gas, Maturity};
+pub use forc_util::Salt;
 
 #[derive(Debug, Default, Parser)]
 #[clap(bin_name = "forc deploy", version)]

forc-plugins/forc-tx/Cargo.toml

@@ -19,6 +19,7 @@ path = "src/main.rs"
 anyhow = "1"
 clap = { version = "3", features = ["derive", "env"] }
 devault = "0.1"
+forc-util = { version = "0.35.5", path = "../../forc-util" }
 fuel-tx = { workspace = true, features = ["serde"] }
 serde = "1.0"
 serde_json = { version = "1" }

forc-plugins/forc-tx/src/lib.rs

@@ -2,6 +2,7 @@
 
 use clap::{Args, Parser};
 use devault::Devault;
+use forc_util::Salt;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use thiserror::Error;
@@ -117,16 +118,6 @@ pub struct Maturity {
     pub maturity: u32,
 }
 
-/// Added salt used to derive the contract ID.
-#[derive(Debug, Args, Default, Deserialize, Serialize)]
-pub struct Salt {
-    /// Added salt used to derive the contract ID.
-    ///
-    /// By default, this is `0x0000000000000000000000000000000000000000000000000000000000000000`.
-    #[clap(long = "salt")]
-    pub salt: Option<fuel_tx::Salt>,
-}
-
 /// Transaction input.
 #[derive(Debug, Parser, Deserialize, Serialize)]
 #[clap(name = "input")]

forc-util/Cargo.toml

@@ -12,9 +12,12 @@ repository.workspace = true
 annotate-snippets = { version = "0.9", features = ["color"] }
 ansi_term = "0.12"
 anyhow = "1"
+clap = { version = "3.1", features = ["cargo", "derive", "env"] }
 dirs = "3.0.2"
 forc-tracing = { version = "0.35.5", path = "../forc-tracing" }
+fuel-tx = { workspace = true, features = ["serde"] }
 hex = "0.4.3"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.73"
 sway-core = { version = "0.35.5", path = "../sway-core" }
 sway-error = { version = "0.35.5", path = "../sway-error" }