Compile panic expression to ABI error codes

Author: ironcev

Cargo.lock

@@ -82,13 +82,13 @@ sway-ir-macros = { path = "sway-ir/sway-ir-macros", version = "0.68.1" }
 #
 
 # Dependencies from the `fuel-abi-types` repository:
-fuel-abi-types = "0.8"
+fuel-abi-types = "0.11"
 
 # Dependencies from the `fuel-core` repository:
 #
-# Although ALL verions are "X.Y", we need the complete semver for
+# Although ALL versions are "X.Y", we need the complete semver for
 # fuel-core-client as the GitHub Actions workflow parses this value to pull down
-# the correct tarball
+# the correct tarball.
 fuel-core-client = { version = "0.43.2", default-features = false }
 fuel-core-types = { version = "0.43", default-features = false }
 
@@ -256,3 +256,9 @@ vte = "0.13"
 walkdir = "2.3"
 whoami = "1.5"
 wiremock = "0.6"
+
+[patch.crates-io]
+fuels = { git = "https://github.com/FuelLabs/fuels-rs", branch = "feat/abi-errors" }
+fuels-core = { git = "https://github.com/FuelLabs/fuels-rs", branch = "feat/abi-errors" }
+fuels-accounts = { git = "https://github.com/FuelLabs/fuels-rs", branch = "feat/abi-errors" }
+fuels-code-gen = { git = "https://github.com/FuelLabs/fuels-rs", branch = "feat/abi-errors" }

Cargo.toml

@@ -1768,9 +1768,15 @@ pub fn compile(
         metrics
     );
 
+    let mut asm = match asm_res {
+        Err(_) => return fail(handler),
+        Ok(asm) => asm,
+    };
+
     const ENCODING_V0: &str = "0";
     const ENCODING_V1: &str = "1";
     const SPEC_VERSION: &str = "1";
+    const SPEC_VERSION_ERROR_TYPE: &str = "1.1";
 
     let mut program_abi = match pkg.target {
         BuildTarget::Fuel => {
@@ -1782,6 +1788,7 @@ pub fn compile(
                     &handler,
                     &mut AbiContext {
                         program: typed_program,
+                        panic_locations: &asm.panic_locations,
                         abi_with_callpaths: true,
                         type_ids_to_full_type_str: HashMap::<String, String>::new(),
                     },
@@ -1791,7 +1798,11 @@ pub fn compile(
                     } else {
                         ENCODING_V0.into()
                     },
-                    SPEC_VERSION.into(),
+                    if experimental.error_type {
+                        SPEC_VERSION_ERROR_TYPE.into()
+                    } else {
+                        SPEC_VERSION.into()
+                    }
                 ),
                 Some(sway_build_config.clone()),
                 metrics
@@ -1805,11 +1816,8 @@ pub fn compile(
         BuildTarget::EVM => {
             // Merge the ABI output of ASM gen with ABI gen to handle internal constructors
             // generated by the ASM backend.
-            let mut ops = match &asm_res {
-                Ok(ref asm) => match &asm.0.abi {
-                    Some(ProgramABI::Evm(ops)) => ops.clone(),
-                    _ => vec![],
-                },
+            let mut ops = match &asm.finalized_asm.abi {
+                Some(ProgramABI::Evm(ops)) => ops.clone(),
                 _ => vec![],
             };
 
@@ -1828,20 +1836,13 @@ pub fn compile(
         }
     };
 
-    let entries = asm_res
-        .as_ref()
-        .map(|asm| asm.0.entries.clone())
-        .unwrap_or_default();
-    let entries = entries
+    let entries = asm
+        .finalized_asm
+        .entries
         .iter()
         .map(|finalized_entry| PkgEntry::from_finalized_entry(finalized_entry, engines))
         .collect::<anyhow::Result<_>>()?;
 
-    let mut asm = match asm_res {
-        Err(_) => return fail(handler),
-        Ok(asm) => asm,
-    };
-
     let bc_res = time_expr!(
         pkg.name,
         "compile asm to bytecode",
@@ -1976,12 +1977,16 @@ fn report_assembly_information(
         data_section: sway_core::asm_generation::DataSectionInformation {
             size: data_section_size,
             used: compiled_asm
-                .0
+                .finalized_asm
                 .data_section
                 .iter_all_entries()
                 .map(|entry| calculate_entry_size(&entry))
                 .sum(),
-            value_pairs: compiled_asm.0.data_section.iter_all_entries().collect(),
+            value_pairs: compiled_asm
+                .finalized_asm
+                .data_section
+                .iter_all_entries()
+                .collect(),
         },
     };