From 0068573a56d3dbbe4f95761ff54bffa4d5cd748a Mon Sep 17 00:00:00 2001
From: Daniel Frederico Lins Leite <xunilrj@hotmail.com>
Date: Wed, 30 Aug 2023 12:50:53 +0100
Subject: [PATCH] correctly solving string slices usign script offset

---
 Cargo.lock                                    |  1 +
 Cargo.toml                                    |  1 +
 forc-plugins/forc-client/Cargo.toml           |  1 +
 forc-plugins/forc-client/src/op/mod.rs        |  2 +-
 forc-plugins/forc-client/src/op/run/encode.rs | 40 ++++++----
 forc-plugins/forc-client/src/op/run/mod.rs    | 41 +++++++---
 sway-core/src/ir_generation/compile.rs        |  1 -
 sway-lib-core/src/ops.sw                      |  4 +-
 sway-lib-core/src/str.sw                      |  1 -
 test/src/e2e_vm_tests/harness.rs              | 53 ++++++++-----
 test/src/e2e_vm_tests/mod.rs                  | 46 +++++++++--
 .../json_abi_oracle.json                      | 78 ++++++++++++++++---
 .../main_args_various_types/src/main.sw       | 43 +++-------
 .../main_args_various_types/test.toml         | 14 +++-
 .../storage_access_caller/src/main.sw         | 15 ++--
 .../src/main.sw                               |  5 --
 test/src/ir_generation/tests/size_of_val.sw   | 31 ++++++++
 17 files changed, 260 insertions(+), 117 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ef34de28d60..5e0134bf7c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1807,6 +1807,7 @@ dependencies = [
  "fuel-vm",
  "fuels-accounts",
  "fuels-core",
+ "fuels-programs",
  "futures",
  "hex",
  "rand",
diff --git a/Cargo.toml b/Cargo.toml
index 667446d510a..3cda76913ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,6 +44,7 @@ fuel-vm = "0.35.3"
 # Dependencies from the `fuels-rs` repository:
 fuels-core = "0.45"
 fuels-accounts = "0.45"
+fuels-programs = "0.45"
 
 # Dependencies from the `forc-wallet` repository:
 forc-wallet = "0.2.5"
diff --git a/forc-plugins/forc-client/Cargo.toml b/forc-plugins/forc-client/Cargo.toml
index 5892360b2df..db6158a6af4 100644
--- a/forc-plugins/forc-client/Cargo.toml
+++ b/forc-plugins/forc-client/Cargo.toml
@@ -27,6 +27,7 @@ fuel-tx = { workspace = true, features = ["builder"] }
 fuel-vm = { workspace = true }
 fuels-accounts = { workspace = true }
 fuels-core = { workspace = true }
+fuels-programs = { workspace = true }
 futures = "0.3"
 hex = "0.4.3"
 rand = "0.8"
diff --git a/forc-plugins/forc-client/src/op/mod.rs b/forc-plugins/forc-client/src/op/mod.rs
index bb7e5746eb4..1640c497a37 100644
--- a/forc-plugins/forc-client/src/op/mod.rs
+++ b/forc-plugins/forc-client/src/op/mod.rs
@@ -3,5 +3,5 @@ mod run;
 mod submit;
 
 pub use deploy::deploy;
-pub use run::run;
+pub use run::{encode_script_data, run, script_offset};
 pub use submit::submit;
diff --git a/forc-plugins/forc-client/src/op/run/encode.rs b/forc-plugins/forc-client/src/op/run/encode.rs
index 3e2ce1ee93f..46cad72c72d 100644
--- a/forc-plugins/forc-client/src/op/run/encode.rs
+++ b/forc-plugins/forc-client/src/op/run/encode.rs
@@ -87,23 +87,31 @@ mod tests {
 
     #[test]
     fn test_main_encoding_success() {
-        let test_json_abi = r#"{"types":[{"typeId":0,"type":"()","components":[],"typeParameters":null},
-{"typeId":1,"type":"bool","components":null,"typeParameters":null},{"typeId":2,"type":"u8","components":null,
-"typeParameters":null}],"functions":[{"inputs":[{"name":"test_u8","type":2,"typeArguments":null},{"name":"test_bool",
-"type":1,"typeArguments":null}],"name":"main","output":{"name":"","type":0,"typeArguments":null},"attributes":null}],
-"loggedTypes":[],"messagesTypes":[],"configurables":[]}"#;
+        let test_json_abi = r#"{"types":[
+            {"typeId":0,"type":"()","components":[],"typeParameters":null},
+            {"typeId":1,"type":"bool","components":null,"typeParameters":null},
+            {"typeId":2,"type":"u8","components":null,"typeParameters":null},
+            {"typeId":3,"type":"str","components":null,"typeParameters":null}
+        ], "functions":[{"inputs":[
+            {"name":"test_u8","type":2,"typeArguments":null},
+            {"name":"test_bool","type":1,"typeArguments":null},
+            {"name":"test_str","type":3,"typeArguments":null}
+        ],"name":"main","output":{"name":"","type":0,"typeArguments":null},"attributes":null}],"loggedTypes":[],"messagesTypes":[],"configurables":[]}"#;
         let call_handler = ScriptCallHandler::from_json_abi_str(test_json_abi).unwrap();
-        let values = ["2", "true"];
-
-        let test_data_offset = 0;
-        let encoded_bytes = call_handler
-            .encode_arguments(&values)
-            .unwrap()
-            .resolve(test_data_offset);
-        let expected_bytes = vec![
-            0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8,
-        ];
-        assert_eq!(encoded_bytes, expected_bytes);
+
+        // Encoded from strings
+        let values = ["2", "true", "abcd"];
+        let encoded_bytes = call_handler.encode_arguments(&values).unwrap().resolve(0);
+        assert_eq!(
+            encoded_bytes,
+            vec![
+                0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 2u8, // 2
+                0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8, // true
+                0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 32u8, // "abcd".ptr
+                0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 4u8, // "abcd".len
+                97u8, 98u8, 99u8, 100u8 // "abcd"
+            ]
+        );
     }
 
     #[test]
diff --git a/forc-plugins/forc-client/src/op/run/mod.rs b/forc-plugins/forc-client/src/op/run/mod.rs
index ea17dd723a7..c4c3a61b796 100644
--- a/forc-plugins/forc-client/src/op/run/mod.rs
+++ b/forc-plugins/forc-client/src/op/run/mod.rs
@@ -13,7 +13,9 @@ use forc_pkg::{self as pkg, fuel_core_not_running, PackageManifestFile};
 use forc_tracing::println_warning;
 use forc_util::tx_utils::format_log_receipts;
 use fuel_core_client::client::FuelClient;
-use fuel_tx::{ContractId, Transaction, TransactionBuilder};
+use fuel_tx::{
+    field::ScriptData, ConsensusParameters, ContractId, Transaction, TransactionBuilder,
+};
 use pkg::BuiltPackage;
 use std::time::Duration;
 use std::{path::PathBuf, str::FromStr};
@@ -72,16 +74,7 @@ pub async fn run_pkg(
     let client = FuelClient::new(node_url.clone())?;
 
     let script_data = match (&command.data, &command.args) {
-        (None, Some(args)) => {
-            let minify_json_abi = true;
-            let package_json_abi = compiled
-                .json_abi_string(minify_json_abi)?
-                .ok_or_else(|| anyhow::anyhow!("Missing json abi string"))?;
-            let main_arg_handler = ScriptCallHandler::from_json_abi_str(&package_json_abi)?;
-            let args = args.iter().map(|arg| arg.as_str()).collect::<Vec<_>>();
-            let unresolved_bytes = main_arg_handler.encode_arguments(args.as_slice())?;
-            unresolved_bytes.resolve(0)
-        }
+        (None, Some(args)) => encode_script_data(compiled, args)?,
         (Some(_), Some(_)) => {
             bail!("Both --args and --data provided, must choose one.")
         }
@@ -135,6 +128,32 @@ pub async fn run_pkg(
     }
 }
 
+/// See https://specs.fuel.network/master/fuel-vm/index.html#vm-initialization
+pub fn script_offset(parameters: &ConsensusParameters, script: &fuel_tx::Script) -> usize {
+    let tx_offset = fuel_tx::Bytes32::LEN // Tx ID
+        + fuels_core::constants::WORD_SIZE // Tx size
+        + parameters.max_inputs as usize * (fuel_tx::AssetId::LEN + fuels_core::constants::WORD_SIZE); // Asset ID/Balance coin input pairs
+
+    tx_offset + script.script_data_offset()
+}
+
+pub fn encode_script_data(
+    compiled: &BuiltPackage,
+    args: &[String],
+) -> Result<Vec<u8>, anyhow::Error> {
+    let minify_json_abi = true;
+    let package_json_abi = compiled
+        .json_abi_string(minify_json_abi)?
+        .ok_or_else(|| anyhow::anyhow!("Missing json abi string"))?;
+
+    let main_arg_handler = ScriptCallHandler::from_json_abi_str(&package_json_abi)?;
+
+    let args = args.iter().map(|arg| arg.as_str()).collect::<Vec<_>>();
+    let unresolved_bytes = main_arg_handler.encode_arguments(args.as_slice())?;
+
+    Ok(unresolved_bytes.resolve(0))
+}
+
 async fn try_send_tx(
     node_url: &str,
     tx: &Transaction,
diff --git a/sway-core/src/ir_generation/compile.rs b/sway-core/src/ir_generation/compile.rs
index c67b8a22de8..50e2b06c932 100644
--- a/sway-core/src/ir_generation/compile.rs
+++ b/sway-core/src/ir_generation/compile.rs
@@ -31,7 +31,6 @@ pub(super) fn compile_script(
     messages_types_map: &HashMap<TypeId, MessageId>,
     test_fns: &[(ty::TyFunctionDecl, DeclRefFunction)],
 ) -> Result<Module, Vec<CompileError>> {
-    println!("1");
     let module = Module::new(context, Kind::Script);
     let mut md_mgr = MetadataManager::default();
 
diff --git a/sway-lib-core/src/ops.sw b/sway-lib-core/src/ops.sw
index 9b5689dc81b..e15414172c8 100644
--- a/sway-lib-core/src/ops.sw
+++ b/sway-lib-core/src/ops.sw
@@ -1299,8 +1299,8 @@ impl Eq for str {
         } else {
             let self_ptr = self.as_ptr();
             let other_ptr = other.as_ptr();
-            asm(r1: self_ptr, r2: other_ptr, r3, r4) {
-                addi r3 zero i32;
+            let l = self.len();
+            asm(r1: self_ptr, r2: other_ptr, r3: l, r4) {
                 meq r4 r1 r2 r3;
                 r4: bool
             }
diff --git a/sway-lib-core/src/str.sw b/sway-lib-core/src/str.sw
index 6d965cf6cf7..cc5acd5d45c 100644
--- a/sway-lib-core/src/str.sw
+++ b/sway-lib-core/src/str.sw
@@ -13,4 +13,3 @@ impl str {
         len
     }
 }
-
diff --git a/test/src/e2e_vm_tests/harness.rs b/test/src/e2e_vm_tests/harness.rs
index 8e5345fcfda..6ec8bb33b89 100644
--- a/test/src/e2e_vm_tests/harness.rs
+++ b/test/src/e2e_vm_tests/harness.rs
@@ -137,14 +137,16 @@ pub(crate) enum VMExecutionResult {
 pub(crate) fn runs_in_vm(
     script: BuiltPackage,
     script_data: Option<Vec<u8>>,
+    verbose: bool,
 ) -> Result<VMExecutionResult> {
     match script.descriptor.target {
         BuildTarget::Fuel => {
             let storage = MemoryStorage::default();
 
+            let script_data = script_data.unwrap_or_default();
+
             let rng = &mut StdRng::seed_from_u64(2322u64);
             let maturity = 1.into();
-            let script_data = script_data.unwrap_or_default();
             let block_height = (u32::MAX >> 1).into();
             let params = ConsensusParameters {
                 // The default max length is 1MB which isn't enough for the bigger tests.
@@ -152,26 +154,41 @@ pub(crate) fn runs_in_vm(
                 ..ConsensusParameters::DEFAULT
             };
 
-            let tx = TransactionBuilder::script(script.bytecode.bytes, script_data)
-                .with_params(params)
-                .add_unsigned_coin_input(
-                    rng.gen(),
-                    rng.gen(),
-                    1,
-                    Default::default(),
-                    rng.gen(),
-                    0u32.into(),
-                )
-                .gas_limit(fuel_tx::ConsensusParameters::DEFAULT.max_gas_per_tx)
-                .maturity(maturity)
-                .finalize_checked(block_height, &GasCosts::default());
+            let tx: fuel_vm::checked_transaction::Checked<Script> =
+                TransactionBuilder::script(script.bytecode.bytes, script_data)
+                    .with_params(params)
+                    .add_unsigned_coin_input(
+                        rng.gen(),
+                        rng.gen(),
+                        1,
+                        Default::default(),
+                        rng.gen(),
+                        0u32.into(),
+                    )
+                    .gas_limit(fuel_tx::ConsensusParameters::DEFAULT.max_gas_per_tx)
+                    .maturity(maturity)
+                    .finalize_checked(block_height, &GasCosts::default());
+
+            if verbose {
+                let offset = forc_client::op::script_offset(
+                    &ConsensusParameters::default(),
+                    tx.transaction(),
+                );
+                println!("\nScript Data Ofsset: {offset}");
+            }
 
             let mut i = Interpreter::with_storage(storage, Default::default(), GasCosts::default());
             let transition = i.transact(tx)?;
-            Ok(VMExecutionResult::Fuel(
-                *transition.state(),
-                transition.receipts().to_vec(),
-            ))
+            let state = *transition.state();
+            let receipts = transition.receipts().to_vec();
+
+            if verbose {
+                for r in receipts.iter() {
+                    println!("{r:?}");
+                }
+            }
+
+            Ok(VMExecutionResult::Fuel(state, receipts))
         }
         BuildTarget::EVM => {
             let mut evm = revm::new();
diff --git a/test/src/e2e_vm_tests/mod.rs b/test/src/e2e_vm_tests/mod.rs
index 8076dc5f2b7..f8e191f417d 100644
--- a/test/src/e2e_vm_tests/mod.rs
+++ b/test/src/e2e_vm_tests/mod.rs
@@ -90,7 +90,8 @@ impl TestContext {
             },
         )
     }
-    async fn run(&self, test: TestDescription, output: &mut String) -> Result<()> {
+
+    async fn run(&self, test: TestDescription, output: &mut String, verbose: bool) -> Result<()> {
         let context = self;
         let TestDescription {
             name,
@@ -140,7 +141,7 @@ impl TestContext {
                     )));
                 }
 
-                let result = harness::runs_in_vm(compiled.clone(), script_data)?;
+                let result = harness::runs_in_vm(compiled.clone(), script_data, verbose)?;
                 let result = match result {
                     harness::VMExecutionResult::Fuel(state, receipts) => {
                         match state {
@@ -423,11 +424,11 @@ pub async fn run(filter_config: &FilterConfig, run_config: &RunConfig) -> Result
 
         let result = if !filter_config.first_only {
             context
-                .run(test, &mut output)
+                .run(test, &mut output, run_config.verbose)
                 .instrument(tracing::trace_span!("E2E", i))
                 .await
         } else {
-            context.run(test, &mut output).await
+            context.run(test, &mut output, run_config.verbose).await
         };
 
         if let Err(err) = result {
@@ -602,11 +603,46 @@ fn parse_test_toml(path: &Path) -> Result<TestDescription> {
         bail!("'fail' tests must contain some FileCheck verification directives.");
     }
 
+    let parse_value = |operand: &str| -> u64 {
+        if let Some(name) = operand.strip_prefix('$') {
+            toml_content
+                .get(name)
+                .map(|x| x.to_string())
+                .and_then(|x| x.parse::<u64>().ok())
+                .unwrap()
+        } else {
+            u64::from_str_radix(operand, 16).unwrap()
+        }
+    };
+
+    // allow variables and simple expressions to script_data
     let script_data = match &category {
         TestCategory::Runs | TestCategory::RunsWithContract => {
             match toml_content.get("script_data") {
                 Some(toml::Value::String(v)) => {
-                    let decoded = hex::decode(v)
+                    // quick parser and evaluator for script data
+                    let mut data = String::new();
+                    let tokens = v.split_whitespace();
+                    for t in tokens {
+                        if t.starts_with('(') && t.ends_with(')') {
+                            let t = &t[1..(t.len() - 1)];
+                            let mut operands = t.split('+');
+                            let l = operands.next().unwrap();
+                            let r = operands.next().unwrap();
+
+                            let l_value = parse_value(l);
+                            let r_value = parse_value(r);
+
+                            let result = l_value + r_value;
+                            let result = format!("{:0>16x}", result);
+                            let result = &result[(result.len() - r.len())..result.len()];
+                            data.push_str(result);
+                        } else {
+                            data.push_str(t);
+                        }
+                    }
+
+                    let decoded = hex::decode(data)
                         .map_err(|e| anyhow!("Invalid hex value for 'script_data': {}", e))?;
                     Some(decoded)
                 }
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle.json
index d537928d87a..d5df57a924a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/json_abi_oracle.json
@@ -13,7 +13,7 @@
       "name": "main",
       "output": {
         "name": "",
-        "type": 5,
+        "type": 2,
         "typeArguments": null
       }
     }
@@ -23,7 +23,7 @@
       "logId": 0,
       "loggedType": {
         "name": "",
-        "type": 5,
+        "type": 4,
         "typeArguments": null
       }
     },
@@ -31,7 +31,55 @@
       "logId": 1,
       "loggedType": {
         "name": "",
-        "type": 5,
+        "type": 4,
+        "typeArguments": null
+      }
+    },
+    {
+      "logId": 2,
+      "loggedType": {
+        "name": "",
+        "type": 6,
+        "typeArguments": null
+      }
+    },
+    {
+      "logId": 3,
+      "loggedType": {
+        "name": "",
+        "type": 6,
+        "typeArguments": null
+      }
+    },
+    {
+      "logId": 4,
+      "loggedType": {
+        "name": "",
+        "type": 4,
+        "typeArguments": null
+      }
+    },
+    {
+      "logId": 5,
+      "loggedType": {
+        "name": "",
+        "type": 4,
+        "typeArguments": null
+      }
+    },
+    {
+      "logId": 6,
+      "loggedType": {
+        "name": "",
+        "type": 6,
+        "typeArguments": null
+      }
+    },
+    {
+      "logId": 7,
+      "loggedType": {
+        "name": "",
+        "type": 6,
         "typeArguments": null
       }
     }
@@ -42,12 +90,12 @@
       "components": [
         {
           "name": "__tuple_element",
-          "type": 4,
+          "type": 5,
           "typeArguments": null
         },
         {
           "name": "__tuple_element",
-          "type": 2,
+          "type": 3,
           "typeArguments": null
         }
       ],
@@ -67,45 +115,51 @@
       "typeId": 1,
       "typeParameters": null
     },
+    {
+      "components": null,
+      "type": "bool",
+      "typeId": 2,
+      "typeParameters": null
+    },
     {
       "components": [
         {
           "name": "Positive",
-          "type": 5,
+          "type": 6,
           "typeArguments": null
         },
         {
           "name": "Negative",
-          "type": 5,
+          "type": 6,
           "typeArguments": null
         }
       ],
       "type": "enum SignedNum",
-      "typeId": 2,
+      "typeId": 3,
       "typeParameters": null
     },
     {
       "components": null,
       "type": "str",
-      "typeId": 3,
+      "typeId": 4,
       "typeParameters": null
     },
     {
       "components": [
         {
           "name": "val",
-          "type": 3,
+          "type": 4,
           "typeArguments": null
         }
       ],
       "type": "struct OpName",
-      "typeId": 4,
+      "typeId": 5,
       "typeParameters": null
     },
     {
       "components": null,
       "type": "u64",
-      "typeId": 5,
+      "typeId": 6,
       "typeParameters": null
     }
   ]
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/src/main.sw
index 7aabdbc0a34..f6d00b5cda0 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/src/main.sw
@@ -9,37 +9,18 @@ struct OpName {
     val: str
 }
 
-fn main(ops: [(OpName, SignedNum); 2]) -> u64 {
-    let mut result = 0;
-    
-    let mut i = 0;
-    while i < 2 {
-        let (op, val) = ops[i];
+fn main(ops: [(OpName, SignedNum); 2]) -> bool {
+    assert_eq(ops[0].0.val, "abcd");
+    assert_eq(match ops[0].1 {
+        SignedNum::Positive(num) => num,
+        _ => revert(1),
+    }, 1338);
 
-        if op.val == "set" {
-            match val {
-                SignedNum::Positive(v) => {
-                    result = v;
-                }
-                SignedNum::Negative(_) => {
-                    revert(0);
-                }
-            }
-        } else if op.val == "add" {
-            match val {
-                SignedNum::Positive(v) => {
-                    result += v;
-                }
-                SignedNum::Negative(v) => {
-                    result -= v;
-                }
-            }
-        } else {
-            revert(0);
-        }
+    assert_eq(ops[1].0.val, "efg");
+     assert_eq(match ops[1].1 {
+        SignedNum::Negative(num) => num,
+        _ => revert(1),
+    }, 1);
 
-        i += 1;
-    }
-
-    result
+    true
 }
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/test.toml b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/test.toml
index d62205b6000..13615cbc70c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/test.toml
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/main_args/main_args_various_types/test.toml
@@ -1,6 +1,12 @@
 category = "run"
- # [("set", SignedNum::Positive(1338)), ("add", SignedNum::Negative(1))]
-script_data = "0000000000002C7800000000000000030000000000000000000000000000053A0000000000002C7B0000000000000003000000000000000100000000000000017365746164640000"
-expected_result = { action = "return", value = 1337 }
+
+script_data_offset = 11256
+script_data = """
+    ($script_data_offset+0000000000000040) 0000000000000004 0000000000000000 000000000000053A 
+    ($script_data_offset+0000000000000044) 0000000000000003 0000000000000001 0000000000000001 
+    61 62 63 64
+    65 66 67
+"""
+expected_result = { action = "return", value = 1 }
 validate_abi = true
-expected_warnings = 5
+expected_warnings = 2
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/storage_access_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/storage_access_caller/src/main.sw
index 79c769713ee..926a259c5b8 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/storage_access_caller/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/storage_access_caller/src/main.sw
@@ -3,14 +3,8 @@ script;
 use storage_access_abi::*;
 use std::hash::*;
 
-fn sha256_str40<T>(s: str[40]) -> b256 {
-    let mut hasher = Hasher::new();
-    hasher.write_str(s);
-    hasher.sha256()
-}
-
 fn main() -> bool {
-    let contract_id = 0x3a0c77d4c1705263d595a90f47c3546ee3fe18d935268335e7aa5dcc62956fc7;
+    let contract_id = 0xb6c24c6014f3460bd65423d6a2701f0bb32b238ddb4f7822cfad0189d46a5e5e;
     let caller = abi(StorageAccess, contract_id);
 
     // Test initializers
@@ -55,7 +49,7 @@ fn main() -> bool {
             revert(0)
         }
     }
-    assert(sha256_str40(caller.get_string()) == sha256_str40("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"));
+    assert(sha256(caller.get_string()) == sha256("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"));
 
     // Test 1
     caller.set_x(1);
@@ -197,8 +191,9 @@ fn main() -> bool {
 
     caller.set_string("fuelfuelfuelfuelfuelfuelfuelfuelfuelfuel");
 
-    // Can't compare strings right now so compare hashes instead
-    assert(sha256_str40(caller.get_string()) == sha256_str40("fuelfuelfuelfuelfuelfuelfuelfuelfuelfuel"));
+    assert(caller.get_string() == "fuelfuelfuelfuelfuelfuelfuelfuelfuelfuel");
+    assert_eq(caller.get_string(), "fuelfuelfuelfuelfuelfuelfuelfuelfuelfuel");
+    assert(sha256(caller.get_string()) == sha256("fuelfuelfuelfuelfuelfuelfuelfuelfuelfuel"));
 
     true
 }
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/contract_with_type_aliases_abi/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/contract_with_type_aliases_abi/src/main.sw
index 9cde94a4743..16d4c8f120e 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/contract_with_type_aliases_abi/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/test_abis/contract_with_type_aliases_abi/src/main.sw
@@ -23,11 +23,6 @@ impl core::ops::Eq for Tuple {
 }
 
 pub type StringTy = str;
-impl core::ops::Eq for StringTy {
-    fn eq(self, other: Self) -> bool {
-        sha256_str9(self) == sha256_str9(other)
-    }
-}
 
 pub type IdentityAliasWrapperAlias = IdentityAliasWrapper;
 impl core::ops::Eq for IdentityAliasWrapperAlias {
diff --git a/test/src/ir_generation/tests/size_of_val.sw b/test/src/ir_generation/tests/size_of_val.sw
index e146794d1e7..070f45865c3 100644
--- a/test/src/ir_generation/tests/size_of_val.sw
+++ b/test/src/ir_generation/tests/size_of_val.sw
@@ -1,9 +1,40 @@
 script;
 
+enum Enum1 {
+    A: u64,
+    B: u64
+}
+
 fn main() {
     let _ = __size_of_val(1);
+    let _ = __size_of_val(Enum1::A(0));
+    let _ = __size_of_val("abcd");
+    let _ = __size_of_val(("abcd",Enum1::A(0)));
+    let _ = __size_of_val([
+        ("abcd",Enum1::A(0)),
+        ("abcd",Enum1::A(0)),
+    ]);
 }
 
 // check: v0 = get_local ptr u64, _, !2
 // check: v1 = const u64 8
 // check: store v1 to v0, !2
+
+// __size_of_val(Enum1::A(0));
+// check: v12 = const u64 16
+// check: store v12 to v11
+
+// __size_of_val("abcd");
+// check: v24 = const u64 16
+// check: store v24 to v23
+
+// __size_of_val(("abcd",Enum1::A(0)))
+// check: v51 = const u64 32
+// check: store v51 to v50
+
+// __size_of_val([
+//        ("abcd",Enum1::A(0)),
+//        ("abcd",Enum1::A(0)),
+//    ])
+// check: v109 = const u64 64
+// check: store v109 to v108
\ No newline at end of file