Merge dff0942 into 5085545

Cargo.toml

@@ -45,14 +45,17 @@ fuel-tx = "0.55.0"
 fuel-vm = "0.55.0"
 
 # Dependencies from the `fuels-rs` repository:
-fuels-core = "0.65.1"
-fuels-accounts = "0.65.1"
+fuels-core = { git = "https://github.com/FuelLabs/fuels-rs", branch = "esdrubal/abi_changes2" }
+fuels-accounts = { git = "https://github.com/FuelLabs/fuels-rs", branch = "esdrubal/abi_changes2" }
 
 # Dependencies from the `forc-wallet` repository:
-forc-wallet = "0.8.2"
+forc-wallet = { git = "https://github.com/FuelLabs/forc-wallet", branch = "esdrubal/abi_changes" }
 
 # Dependencies from the `fuel-abi-types` repository:
-fuel-abi-types = "0.5.2"
+fuel-abi-types = { git = "https://github.com/FuelLabs/fuel-abi-types", branch = "esdrubal/abi_changes2" }
+
+[patch.crates-io]
+fuel-abi-types = { git = "https://github.com/FuelLabs/fuel-abi-types", branch = "esdrubal/abi_changes2" }
 
 [workspace.package]
 edition = "2021"

docs/book/src/forc/manifest_reference.md

@@ -76,7 +76,6 @@ The following fields can be provided for a build-profile:
 * `terse` - Terse mode. Limited warning and error output, defaults to false.
 * `time_phases` - Whether to output the time elapsed over each part of the compilation process, defaults to false.
 * `include_tests` -  Whether or not to include test functions in parsing, type-checking, and code generation. This is set to true by invocations like `forc test`, but defaults to false.
-* `json_abi_with_callpaths` - Whether to generate a JSON ABI with `callpaths` instead of names for structs and enums, defaults to false. This option can help prevent conflicting struct or enum definitions by using the full path instead of the name.
 * `error_on_warnings` - Whether to treat errors as warnings, defaults to false.
 
 There are two default `[build-profile]` available with every manifest file. These are `debug` and `release` profiles. If you want to override these profiles, you can provide them explicitly in the manifest file like the following example:

forc-pkg/src/manifest/build_profile.rs

@@ -34,8 +34,6 @@ pub struct BuildProfile {
     #[serde(default)]
     pub include_tests: bool,
     #[serde(default)]
-    pub json_abi_with_callpaths: bool,
-    #[serde(default)]
     pub error_on_warnings: bool,
     #[serde(default)]
     pub reverse_results: bool,
@@ -64,7 +62,6 @@ impl BuildProfile {
             time_phases: false,
             metrics_outfile: None,
             include_tests: false,
-            json_abi_with_callpaths: false,
             error_on_warnings: false,
             reverse_results: false,
             optimization_level: OptLevel::Opt0,
@@ -88,7 +85,6 @@ impl BuildProfile {
             time_phases: false,
             metrics_outfile: None,
             include_tests: false,
-            json_abi_with_callpaths: false,
             error_on_warnings: false,
             reverse_results: false,
             optimization_level: OptLevel::Opt1,
@@ -161,7 +157,6 @@ mod tests {
             time_phases: true,
             metrics_outfile: Some("metrics_outfile".into()),
             include_tests: true,
-            json_abi_with_callpaths: true,
             error_on_warnings: true,
             reverse_results: true,
             optimization_level: OptLevel::Opt0,