From 597436296e05261699742c7fbb5be5427c0d60bf Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Tue, 10 Sep 2024 14:12:52 +0530
Subject: [PATCH 01/38] Add 32 bytes of 0'd metadata in the preamble

---
 sway-core/src/asm_generation/finalized_asm.rs | 23 +++++++++++--
 .../allocated_abstract_instruction_set.rs     |  9 ++++++
 .../asm_generation/fuel/programs/abstract.rs  | 24 +++++++++++---
 sway-core/src/asm_lang/allocated_ops.rs       | 32 +++++++++++++------
 sway-core/src/asm_lang/mod.rs                 | 13 ++++++++
 5 files changed, 83 insertions(+), 18 deletions(-)

diff --git a/sway-core/src/asm_generation/finalized_asm.rs b/sway-core/src/asm_generation/finalized_asm.rs
index 9c2d3f565ab..3ce1b69f7c7 100644
--- a/sway-core/src/asm_generation/finalized_asm.rs
+++ b/sway-core/src/asm_generation/finalized_asm.rs
@@ -5,7 +5,7 @@ use super::{
     ProgramABI, ProgramKind,
 };
 use crate::asm_generation::fuel::data_section::{DataId, Datum, Entry};
-use crate::asm_lang::allocated_ops::{AllocatedOp, AllocatedOpcode};
+use crate::asm_lang::allocated_ops::{AllocatedOp, AllocatedOpcode, FuelAsmData};
 use crate::decl_engine::DeclRefFunction;
 use crate::source_map::SourceMap;
 use crate::BuildConfig;
@@ -117,6 +117,7 @@ fn to_bytecode_mut(
             {
                 8
             }
+            AllocatedOpcode::Metadata => 32,
             AllocatedOpcode::DataSectionOffsetPlaceholder => 8,
             AllocatedOpcode::BLOB(count) => count.value as u64 * 4,
             AllocatedOpcode::CFEI(i) | AllocatedOpcode::CFSI(i) if i.value == 0 => 0,
@@ -171,7 +172,7 @@ fn to_bytecode_mut(
         offset_from_instr_start += op_size_in_bytes(data_section, op);
 
         match fuel_op {
-            Either::Right(data) => {
+            FuelAsmData::DatasectionOffset(data) => {
                 if build_config.print_bytecode {
                     print!("{}{:#010x} ", " ".repeat(indentation), bytecode.len());
                     println!(
@@ -187,7 +188,23 @@ fn to_bytecode_mut(
                 bytecode.extend(data.iter().cloned());
                 half_word_ix += 2;
             }
-            Either::Left(instructions) => {
+            FuelAsmData::Metadata(data) => {
+                if build_config.print_bytecode {
+                    print!("{}{:#010x} ", " ".repeat(indentation), bytecode.len());
+                    println!(
+                        "                                                ;; {:?}",
+                        data
+                    );
+                }
+
+                // Static assert to ensure that we're only dealing with Metadata,
+                // a 4-word (32 bytes) data within the code. No other uses are known.
+                let _: [u8; 32] = data;
+
+                bytecode.extend(data.iter().cloned());
+                half_word_ix += 8;
+            }
+            FuelAsmData::Instructions(instructions) => {
                 for instruction in instructions {
                     // Print original source span only once
                     if build_config.print_bytecode_spans {
diff --git a/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs b/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs
index fc218425daf..c719818c381 100644
--- a/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs
+++ b/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs
@@ -324,6 +324,13 @@ impl AllocatedAbstractInstructionSet {
                             comment: String::new(),
                         });
                     }
+                    ControlFlowOp::Metadata => {
+                        realized_ops.push(RealizedOp {
+                            opcode: AllocatedOpcode::Metadata,
+                            owning_span: None,
+                            comment: String::new(),
+                        });
+                    }
                     ControlFlowOp::LoadLabel(r1, ref lab) => {
                         // LoadLabel ops are inserted by `rewrite_far_jumps`.
                         // So the next instruction must be a relative jump.
@@ -449,6 +456,8 @@ impl AllocatedAbstractInstructionSet {
                 2
             }
 
+            Either::Right(Metadata) => 8,
+
             Either::Right(PushAll(_)) | Either::Right(PopAll(_)) => unreachable!(
                 "fix me, pushall and popall don't really belong in control flow ops \
                         since they're not about control flow"
diff --git a/sway-core/src/asm_generation/fuel/programs/abstract.rs b/sway-core/src/asm_generation/fuel/programs/abstract.rs
index c30f72621e7..2d88afea684 100644
--- a/sway-core/src/asm_generation/fuel/programs/abstract.rs
+++ b/sway-core/src/asm_generation/fuel/programs/abstract.rs
@@ -160,12 +160,20 @@ impl AbstractProgram {
     ///
     /// WORD OP
     /// 1    MOV $scratch $pc
-    /// -    JMPF $zero i2
+    /// -    JMPF $zero i4
     /// 2    DATA_START (0-32) (in bytes, offset from $is)
     /// -    DATA_START (32-64)
-    /// 3    LW $ds $scratch 1
+    /// 3    METADATA (0-32)
+    /// -    METADATA (32-64)
+    /// 4    METADATA (64-96)
+    /// -    METADATA (96-128)
+    /// 5    METADATA (128-160)
+    /// -    METADATA (160-192)
+    /// 6    METADATA (192-224)
+    /// -    METADATA (224-256)
+    /// 7    LW $ds $scratch 1
     /// -    ADD $ds $ds $scratch
-    /// 4    .program_start:
+    /// 8    .program_start:
     fn build_prologue(&mut self) -> AllocatedAbstractInstructionSet {
         let label = self.reg_seqr.get_label();
         AllocatedAbstractInstructionSet {
@@ -190,12 +198,18 @@ impl AbstractProgram {
                     comment: "data section offset".into(),
                     owning_span: None,
                 },
+                // word 3 -- 32 bytes placeholder
+                AllocatedAbstractOp {
+                    opcode: Either::Right(ControlFlowOp::Metadata),
+                    comment: "metadata".into(),
+                    owning_span: None,
+                },
                 AllocatedAbstractOp {
                     opcode: Either::Right(ControlFlowOp::Label(label)),
                     comment: "end of metadata".into(),
                     owning_span: None,
                 },
-                // word 3 -- load the data offset into $ds
+                // word 7 -- load the data offset into $ds
                 AllocatedAbstractOp {
                     opcode: Either::Left(AllocatedOpcode::LW(
                         AllocatedRegister::Constant(ConstantRegister::DataSectionStart),
@@ -205,7 +219,7 @@ impl AbstractProgram {
                     comment: "".into(),
                     owning_span: None,
                 },
-                // word 3.5 -- add $ds $ds $is
+                // word 7.5 -- add $ds $ds $is
                 AllocatedAbstractOp {
                     opcode: Either::Left(AllocatedOpcode::ADD(
                         AllocatedRegister::Constant(ConstantRegister::DataSectionStart),
diff --git a/sway-core/src/asm_lang/allocated_ops.rs b/sway-core/src/asm_lang/allocated_ops.rs
index 5590279cde7..72ad640cfc0 100644
--- a/sway-core/src/asm_lang/allocated_ops.rs
+++ b/sway-core/src/asm_lang/allocated_ops.rs
@@ -17,7 +17,6 @@ use crate::{
     },
     fuel_prelude::fuel_asm::{self, op},
 };
-use either::Either;
 use fuel_vm::fuel_asm::{op::ADDI, Imm12};
 use std::fmt::{self, Write};
 use sway_types::span::Span;
@@ -269,6 +268,7 @@ pub(crate) enum AllocatedOpcode {
 
     /* Non-VM Instructions */
     BLOB(VirtualImmediate24),
+    Metadata,
     DataSectionOffsetPlaceholder,
     LoadDataId(AllocatedRegister, DataId),
     AddrDataId(AllocatedRegister, DataId),
@@ -393,6 +393,7 @@ impl AllocatedOpcode {
 
             /* Non-VM Instructions */
             BLOB(_imm) => vec![],
+            Metadata => vec![],
             DataSectionOffsetPlaceholder => vec![],
             LoadDataId(r1, _i) => vec![r1],
             AddrDataId(r1, _i) => vec![r1],
@@ -521,6 +522,7 @@ impl fmt::Display for AllocatedOpcode {
 
             /* Non-VM Instructions */
             BLOB(a) => write!(fmtr, "blob {a}"),
+            Metadata => write!(fmtr, "Metadata"),
             DataSectionOffsetPlaceholder => {
                 write!(
                     fmtr,
@@ -558,7 +560,11 @@ impl fmt::Display for AllocatedOp {
     }
 }
 
-type DoubleWideData = [u8; 8];
+pub(crate) enum FuelAsmData {
+    Metadata([u8; 32]),
+    DatasectionOffset([u8; 8]),
+    Instructions(Vec<fuel_asm::Instruction>),
+}
 
 impl AllocatedOp {
     pub(crate) fn to_fuel_asm(
@@ -566,9 +572,9 @@ impl AllocatedOp {
         offset_to_data_section: u64,
         offset_from_instr_start: u64,
         data_section: &mut DataSection,
-    ) -> Either<Vec<fuel_asm::Instruction>, DoubleWideData> {
+    ) -> FuelAsmData {
         use AllocatedOpcode::*;
-        Either::Left(vec![match &self.opcode {
+        FuelAsmData::Instructions(vec![match &self.opcode {
             /* Arithmetic/Logic (ALU) Instructions */
             ADD(a, b, c) => op::ADD::new(a.to_reg_id(), b.to_reg_id(), c.to_reg_id()).into(),
             ADDI(a, b, c) => op::ADDI::new(a.to_reg_id(), b.to_reg_id(), c.value.into()).into(),
@@ -637,9 +643,9 @@ impl AllocatedOp {
 
             /* Memory Instructions */
             ALOC(a) => op::ALOC::new(a.to_reg_id()).into(),
-            CFEI(a) if a.value == 0 => return Either::Left(vec![]),
+            CFEI(a) if a.value == 0 => return FuelAsmData::Instructions(vec![]),
             CFEI(a) => op::CFEI::new(a.value.into()).into(),
-            CFSI(a) if a.value == 0 => return Either::Left(vec![]),
+            CFSI(a) if a.value == 0 => return FuelAsmData::Instructions(vec![]),
             CFSI(a) => op::CFSI::new(a.value.into()).into(),
             CFE(a) => op::CFE::new(a.to_reg_id()).into(),
             CFS(a) => op::CFS::new(a.to_reg_id()).into(),
@@ -723,17 +729,23 @@ impl AllocatedOp {
 
             /* Non-VM Instructions */
             BLOB(a) => {
-                return Either::Left(
+                return FuelAsmData::Instructions(
                     std::iter::repeat(op::NOOP::new().into())
                         .take(a.value as usize)
                         .collect(),
                 )
             }
+            Metadata => {
+                return FuelAsmData::Metadata([
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                    0, 0, 0, 0, 0, 0,
+                ])
+            }
             DataSectionOffsetPlaceholder => {
-                return Either::Right(offset_to_data_section.to_be_bytes())
+                return FuelAsmData::DatasectionOffset(offset_to_data_section.to_be_bytes())
             }
             LoadDataId(a, b) => {
-                return Either::Left(realize_load(
+                return FuelAsmData::Instructions(realize_load(
                     a,
                     b,
                     data_section,
@@ -741,7 +753,7 @@ impl AllocatedOp {
                     offset_from_instr_start,
                 ))
             }
-            AddrDataId(a, b) => return Either::Left(addr_of(a, b, data_section)),
+            AddrDataId(a, b) => return FuelAsmData::Instructions(addr_of(a, b, data_section)),
             Undefined => unreachable!("Sway cannot generate undefined ASM opcodes"),
         }])
     }
diff --git a/sway-core/src/asm_lang/mod.rs b/sway-core/src/asm_lang/mod.rs
index 5e1bcaded52..310107877b1 100644
--- a/sway-core/src/asm_lang/mod.rs
+++ b/sway-core/src/asm_lang/mod.rs
@@ -1277,6 +1277,8 @@ pub(crate) enum ControlFlowOp<Reg> {
     Call(Label),
     // Save a return label address in a register.
     SaveRetAddr(Reg, Label),
+    // Placeholder for Metadata
+    Metadata,
     // placeholder for the DataSection offset
     DataSectionOffsetPlaceholder,
     // Placeholder for loading an address from the data section.
@@ -1304,6 +1306,11 @@ impl<Reg: fmt::Display> fmt::Display for ControlFlowOp<Reg> {
                 SaveRetAddr(r1, lab) => format!("mova {r1} {lab}"),
                 DataSectionOffsetPlaceholder =>
                     "DATA SECTION OFFSET[0..32]\nDATA SECTION OFFSET[32..64]".into(),
+                Metadata => "METADATA[0..32]\nMETADATA[32..64]\n\
+                     METADATA[64..96]\nMETADATA[96..128]\n\
+                     METADATA[128..160]\nMETADATA[160..192]\n\
+                     METADATA[192..224]\nMETADATA[224..256]"
+                    .into(),
                 LoadLabel(r1, lab) => format!("lwlab {r1} {lab}"),
                 PushAll(lab) => format!("pusha {lab}"),
                 PopAll(lab) => format!("popa {lab}"),
@@ -1321,6 +1328,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | Jump(_)
             | Call(_)
             | DataSectionOffsetPlaceholder
+            | Metadata
             | PushAll(_)
             | PopAll(_) => vec![],
 
@@ -1339,6 +1347,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | Call(_)
             | SaveRetAddr(..)
             | DataSectionOffsetPlaceholder
+            | Metadata
             | LoadLabel(..)
             | PushAll(_)
             | PopAll(_) => vec![],
@@ -1360,6 +1369,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | JumpIfNotZero(..)
             | Call(_)
             | DataSectionOffsetPlaceholder
+            | Metadata
             | PushAll(_)
             | PopAll(_) => vec![],
         })
@@ -1381,6 +1391,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | Jump(_)
             | Call(_)
             | DataSectionOffsetPlaceholder
+            | Metadata
             | PushAll(_)
             | PopAll(_) => self.clone(),
 
@@ -1410,6 +1421,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | Call(_)
             | SaveRetAddr(..)
             | DataSectionOffsetPlaceholder
+            | Metadata
             | LoadLabel(..)
             | PushAll(_)
             | PopAll(_) => (),
@@ -1466,6 +1478,7 @@ impl ControlFlowOp<VirtualRegister> {
             Jump(label) => Jump(*label),
             Call(label) => Call(*label),
             DataSectionOffsetPlaceholder => DataSectionOffsetPlaceholder,
+            Metadata => Metadata,
             PushAll(label) => PushAll(*label),
             PopAll(label) => PopAll(*label),
 

From 6f5c1b2584fed24b74375a04e4a8fee3f06b26ec Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Tue, 10 Sep 2024 14:16:17 +0530
Subject: [PATCH 02/38] fix clippy

---
 sway-core/src/asm_generation/finalized_asm.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sway-core/src/asm_generation/finalized_asm.rs b/sway-core/src/asm_generation/finalized_asm.rs
index 3ce1b69f7c7..2625e04e9fb 100644
--- a/sway-core/src/asm_generation/finalized_asm.rs
+++ b/sway-core/src/asm_generation/finalized_asm.rs
@@ -17,7 +17,6 @@ use sway_error::handler::{ErrorEmitted, Handler};
 use sway_types::span::Span;
 use sway_types::SourceEngine;
 
-use either::Either;
 use std::{collections::BTreeMap, fmt};
 
 /// Represents an ASM set which has had register allocation, jump elimination, and optimization

From 1b99c89492cf1a587e492a75a92dadf09228521a Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 11 Sep 2024 11:47:48 +0530
Subject: [PATCH 03/38] update patch_test_bytecode for forc test

---
 forc-test/src/execute.rs                      | 24 ++++++++++++-------
 .../asm_generation/fuel/programs/abstract.rs  |  2 +-
 sway-core/src/asm_lang/mod.rs                 |  1 +
 sway-core/src/asm_lang/virtual_ops.rs         |  8 +++++++
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/forc-test/src/execute.rs b/forc-test/src/execute.rs
index 3436261af94..78aa5fd2d7c 100644
--- a/forc-test/src/execute.rs
+++ b/forc-test/src/execute.rs
@@ -246,17 +246,25 @@ impl TestExecutor {
 /// The following is how the beginning of the bytecode is laid out:
 ///
 /// ```ignore
-/// [0] ji   i4                       ; Jumps to the data section setup.
-/// [1] noop
-/// [2] DATA_SECTION_OFFSET[0..32]
-/// [3] DATA_SECTION_OFFSET[32..64]
-/// [4] lw   $ds $is 1                ; The data section setup, i.e. where the first ji lands.
-/// [5] add  $$ds $$ds $is
-/// [6] <first-entry-point>           ; This is where we want to jump from to our test code!
+/// [ 0] ji   i4                       ; Jumps to the data section setup.
+/// [ 1] noop
+/// [ 2] DATA_SECTION_OFFSET[0..32]
+/// [ 3] DATA_SECTION_OFFSET[32..64]
+/// [ 4] METADATA (0-32)
+/// [ 5] METADATA (32-64)
+/// [ 6] METADATA (64-96)
+/// [ 7] METADATA (96-128)
+/// [ 8] METADATA (128-160)
+/// [ 9] METADATA (160-192)
+/// [10] METADATA (192-224)
+/// [11] METADATA (224-256)
+/// [12] lw   $ds $is 1                ; The data section setup, i.e. where the first ji lands.
+/// [13] add  $$ds $$ds $is
+/// [14] <first-entry-point>           ; This is where we want to jump from to our test code!
 /// ```
 fn patch_test_bytecode(bytecode: &[u8], test_offset: u32) -> std::borrow::Cow<[u8]> {
     // TODO: Standardize this or add metadata to bytecode.
-    const PROGRAM_START_INST_OFFSET: u32 = 6;
+    const PROGRAM_START_INST_OFFSET: u32 = 14;
     const PROGRAM_START_BYTE_OFFSET: usize = PROGRAM_START_INST_OFFSET as usize * Instruction::SIZE;
 
     // If our desired entry point is the program start, no need to jump.
diff --git a/sway-core/src/asm_generation/fuel/programs/abstract.rs b/sway-core/src/asm_generation/fuel/programs/abstract.rs
index 2d88afea684..4f8e2e93fe3 100644
--- a/sway-core/src/asm_generation/fuel/programs/abstract.rs
+++ b/sway-core/src/asm_generation/fuel/programs/abstract.rs
@@ -160,7 +160,7 @@ impl AbstractProgram {
     ///
     /// WORD OP
     /// 1    MOV $scratch $pc
-    /// -    JMPF $zero i4
+    /// -    JMPF $zero i10
     /// 2    DATA_START (0-32) (in bytes, offset from $is)
     /// -    DATA_START (32-64)
     /// 3    METADATA (0-32)
diff --git a/sway-core/src/asm_lang/mod.rs b/sway-core/src/asm_lang/mod.rs
index 310107877b1..7c69aa423cc 100644
--- a/sway-core/src/asm_lang/mod.rs
+++ b/sway-core/src/asm_lang/mod.rs
@@ -1248,6 +1248,7 @@ impl fmt::Display for VirtualOp {
             /* Non-VM Instructions */
             BLOB(a) => write!(fmtr, "blob {a}"),
             DataSectionOffsetPlaceholder => write!(fmtr, "data section offset placeholder"),
+            Metadata => write!(fmtr, "Metadata"),
             LoadDataId(a, b) => write!(fmtr, "load {a} {b}"),
             AddrDataId(a, b) => write!(fmtr, "addr {a} {b}"),
             Undefined => write!(fmtr, "undefined op"),
diff --git a/sway-core/src/asm_lang/virtual_ops.rs b/sway-core/src/asm_lang/virtual_ops.rs
index ffe3509b7cd..17d3e281c0c 100644
--- a/sway-core/src/asm_lang/virtual_ops.rs
+++ b/sway-core/src/asm_lang/virtual_ops.rs
@@ -226,6 +226,7 @@ pub(crate) enum VirtualOp {
 
     /* Non-VM Instructions */
     BLOB(VirtualImmediate24),
+    Metadata,
     DataSectionOffsetPlaceholder,
     // LoadDataId takes a virtual register and a DataId, which points to a labeled piece
     // of data in the data section. Note that the ASM op corresponding to a LW is
@@ -347,6 +348,7 @@ impl VirtualOp {
             /* Non-VM Instructions */
             BLOB(_imm) => vec![],
             DataSectionOffsetPlaceholder => vec![],
+            Metadata => vec![],
             LoadDataId(r1, _i) => vec![r1],
             AddrDataId(r1, _) => vec![r1],
 
@@ -465,6 +467,7 @@ impl VirtualOp {
             // Virtual OPs
             | BLOB(_)
             | DataSectionOffsetPlaceholder
+            | Metadata
             | Undefined => true
         }
     }
@@ -571,6 +574,7 @@ impl VirtualOp {
             | GTF(_, _, _)
             | BLOB(_)
             | DataSectionOffsetPlaceholder
+            | Metadata
             | LoadDataId(_, _)
             | AddrDataId(_, _)
             | Undefined => vec![],
@@ -692,6 +696,7 @@ impl VirtualOp {
             /* Non-VM Instructions */
             BLOB(_imm) => vec![],
             DataSectionOffsetPlaceholder => vec![],
+            Metadata => vec![],
             LoadDataId(_r1, _i) => vec![],
             AddrDataId(_r1, _i) => vec![],
 
@@ -815,6 +820,7 @@ impl VirtualOp {
             LoadDataId(r1, _i) => vec![r1],
             AddrDataId(r1, _i) => vec![r1],
             DataSectionOffsetPlaceholder => vec![],
+            Metadata => vec![],
             Undefined => vec![],
         })
         .into_iter()
@@ -1263,6 +1269,7 @@ impl VirtualOp {
             /* Non-VM Instructions */
             BLOB(i) => Self::BLOB(i.clone()),
             DataSectionOffsetPlaceholder => Self::DataSectionOffsetPlaceholder,
+            Metadata => Self::Metadata,
             LoadDataId(r1, i) => Self::LoadDataId(update_reg(reg_to_reg_map, r1), i.clone()),
             AddrDataId(r1, i) => Self::AddrDataId(update_reg(reg_to_reg_map, r1), i.clone()),
             Undefined => Self::Undefined,
@@ -1743,6 +1750,7 @@ impl VirtualOp {
             /* Non-VM Instructions */
             BLOB(imm) => AllocatedOpcode::BLOB(imm.clone()),
             DataSectionOffsetPlaceholder => AllocatedOpcode::DataSectionOffsetPlaceholder,
+            Metadata => AllocatedOpcode::Metadata,
             LoadDataId(reg1, label) => {
                 AllocatedOpcode::LoadDataId(map_reg(&mapping, reg1), label.clone())
             }

From d0c8236d1605293ed778606fcac3a61087fdf331 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 11 Sep 2024 15:04:07 +0530
Subject: [PATCH 04/38] allow setting metadata from forc-pkg

---
 forc-pkg/src/pkg.rs                           | 17 +++++++++-----
 forc-test/src/execute.rs                      |  9 ++++----
 .../asm_generation/fuel/programs/abstract.rs  | 12 ++++++++++
 sway-core/src/lib.rs                          | 22 +++++++++++++++++++
 4 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
index 2dbbc45f20d..5800ec5ab0d 100644
--- a/forc-pkg/src/pkg.rs
+++ b/forc-pkg/src/pkg.rs
@@ -49,7 +49,7 @@ use sway_core::{
     transform::AttributeKind,
     write_dwarf, BuildTarget, Engines, FinalizedEntry, LspConfig,
 };
-use sway_core::{PrintAsm, PrintIr};
+use sway_core::{set_bytecode_metadata, PrintAsm, PrintIr};
 use sway_error::{error::CompileError, handler::Handler, warning::CompileWarning};
 use sway_types::constants::{CORE, PRELUDE, STD};
 use sway_types::{Ident, Span, Spanned};
@@ -1914,7 +1914,7 @@ pub fn compile(
 
     let errored = handler.has_errors() || (handler.has_warnings() && profile.error_on_warnings);
 
-    let compiled = match bc_res {
+    let mut compiled = match bc_res {
         Ok(compiled) if !errored => compiled,
         _ => return fail(handler),
     };
@@ -1934,14 +1934,21 @@ pub fn compile(
                     .contains_key(&c.name)
             });
             // Set the actual offsets in the JSON object
-            for (config, offset) in compiled.named_data_section_entries_offsets {
-                if let Some(idx) = configurables.iter().position(|c| c.name == config) {
-                    configurables[idx].offset = offset;
+            for (config, offset) in &compiled.named_data_section_entries_offsets {
+                if let Some(idx) = configurables.iter().position(|c| &c.name == config) {
+                    configurables[idx].offset = *offset;
                 }
             }
         }
     }
 
+    // TODO: Compute metadata as a 256bit hash from program_abi.
+    let md = [
+        0u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0,
+    ];
+    set_bytecode_metadata(&mut compiled, &md);
+
     metrics.bytecode_size = compiled.bytecode.len();
     let bytecode = BuiltPackageBytecode {
         bytes: compiled.bytecode,
diff --git a/forc-test/src/execute.rs b/forc-test/src/execute.rs
index 78aa5fd2d7c..52dec2afe04 100644
--- a/forc-test/src/execute.rs
+++ b/forc-test/src/execute.rs
@@ -9,7 +9,7 @@ use fuel_vm::{
     self as vm,
     checked_transaction::builder::TransactionBuilderExt,
     interpreter::{Interpreter, NotSupportedEcal},
-    prelude::{Instruction, SecretKey},
+    prelude::SecretKey,
     storage::MemoryStorage,
 };
 use rand::{Rng, SeedableRng};
@@ -263,9 +263,10 @@ impl TestExecutor {
 /// [14] <first-entry-point>           ; This is where we want to jump from to our test code!
 /// ```
 fn patch_test_bytecode(bytecode: &[u8], test_offset: u32) -> std::borrow::Cow<[u8]> {
-    // TODO: Standardize this or add metadata to bytecode.
-    const PROGRAM_START_INST_OFFSET: u32 = 14;
-    const PROGRAM_START_BYTE_OFFSET: usize = PROGRAM_START_INST_OFFSET as usize * Instruction::SIZE;
+    // Each instruction is 4 bytes,
+    // so we divide the totaly byte-size by 4 to get the instruction offset.
+    const PROGRAM_START_INST_OFFSET: u32 = (sway_core::PRELUDE_SIZE_IN_BYTES / 4) as u32;
+    const PROGRAM_START_BYTE_OFFSET: usize = sway_core::PRELUDE_SIZE_IN_BYTES;
 
     // If our desired entry point is the program start, no need to jump.
     if test_offset == PROGRAM_START_INST_OFFSET {
diff --git a/sway-core/src/asm_generation/fuel/programs/abstract.rs b/sway-core/src/asm_generation/fuel/programs/abstract.rs
index 4f8e2e93fe3..fd4c14f0154 100644
--- a/sway-core/src/asm_generation/fuel/programs/abstract.rs
+++ b/sway-core/src/asm_generation/fuel/programs/abstract.rs
@@ -175,6 +175,18 @@ impl AbstractProgram {
     /// -    ADD $ds $ds $scratch
     /// 8    .program_start:
     fn build_prologue(&mut self) -> AllocatedAbstractInstructionSet {
+        const _: () = assert!(
+            crate::PRELUDE_METADATA_OFFSET_IN_BYTES == 16,
+            "Inconsitency in the assumption of prelude organisation"
+        );
+        const _: () = assert!(
+            crate::PRELUDE_METADATA_SIZE_IN_BYTES == 32,
+            "Inconsitency in the assumption of prelude organisation"
+        );
+        const _: () = assert!(
+            crate::PRELUDE_SIZE_IN_BYTES == 56,
+            "Inconsitency in the assumption of prelude organisation"
+        );
         let label = self.reg_seqr.get_label();
         AllocatedAbstractInstructionSet {
             ops: [
diff --git a/sway-core/src/lib.rs b/sway-core/src/lib.rs
index c744255156d..005471202a7 100644
--- a/sway-core/src/lib.rs
+++ b/sway-core/src/lib.rs
@@ -993,6 +993,28 @@ pub fn compile_to_bytecode(
     asm_to_bytecode(handler, asm_res, source_map, engines.se(), build_config)
 }
 
+/// Size of the prelude's METADATA section, in bytes.
+pub const PRELUDE_METADATA_SIZE_IN_BYTES: usize = 32;
+/// Offset (in bytes) of the METADATA section in the prelude.
+pub const PRELUDE_METADATA_OFFSET_IN_BYTES: usize = 16;
+/// Total size of the prelude in bytes. Instructions start right after.
+pub const PRELUDE_SIZE_IN_BYTES: usize = 56;
+
+/// Given bytecode, overwrite the existing Metadata in the prelude with the given one.
+pub fn set_bytecode_metadata(
+    compiled_bytecode: &mut CompiledBytecode,
+    md: &[u8; PRELUDE_METADATA_SIZE_IN_BYTES],
+) {
+    assert!(
+        compiled_bytecode.bytecode.len()
+            >= PRELUDE_METADATA_OFFSET_IN_BYTES + PRELUDE_METADATA_SIZE_IN_BYTES
+    );
+    let code = &mut compiled_bytecode.bytecode;
+    for (index, byte) in md.iter().enumerate() {
+        code[index + PRELUDE_METADATA_OFFSET_IN_BYTES] = *byte;
+    }
+}
+
 /// Given the assembly (opcodes), compile to [CompiledBytecode], containing the asm in bytecode form.
 pub fn asm_to_bytecode(
     handler: &Handler,

From 7a80a144f00850b393af8ab119cd7f275f070704 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 12 Sep 2024 08:30:25 +0530
Subject: [PATCH 05/38] add hash of the ABI as metadata

---
 forc-pkg/src/pkg.rs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
index 5800ec5ab0d..458ce65b3a1 100644
--- a/forc-pkg/src/pkg.rs
+++ b/forc-pkg/src/pkg.rs
@@ -25,7 +25,7 @@ use std::{
     collections::{hash_map, BTreeSet, HashMap, HashSet},
     fmt,
     fs::{self, File},
-    hash::{Hash, Hasher},
+    hash::{Hash, Hasher as StdHasher},
     io::Write,
     path::{Path, PathBuf},
     str::FromStr,
@@ -1923,6 +1923,11 @@ pub fn compile(
 
     print_warnings(engines.se(), terse_mode, &pkg.name, &warnings, &tree_type);
 
+    // Metadata to be placed into the binary.
+    let mut md = [
+        0u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0,
+    ];
     // TODO: This should probably be in `fuel_abi_json::generate_json_abi_program`?
     // If ABI requires knowing config offsets, they should be inputs to ABI gen.
     if let ProgramABI::Fuel(ref mut program_abi) = program_abi {
@@ -1940,13 +1945,18 @@ pub fn compile(
                 }
             }
         }
+
+        // Set metadata to a hash of the ABI.
+        // TODO: Do the right thing. This is just a placeholder.
+        let abi_json = serde_json::to_string_pretty(&program_abi)?;
+        let mut hasher = std::hash::DefaultHasher::new();
+        abi_json.hash(&mut hasher);
+        let hash: [u8; 8] = hasher.finish().to_be_bytes();
+        for (index, byte) in md.iter_mut().enumerate() {
+            *byte = hash[index];
+        }
     }
 
-    // TODO: Compute metadata as a 256bit hash from program_abi.
-    let md = [
-        0u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0,
-    ];
     set_bytecode_metadata(&mut compiled, &md);
 
     metrics.bytecode_size = compiled.bytecode.len();

From fa836dad9a09bac2fac3418ef4dab513830819a9 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 12 Sep 2024 08:46:37 +0530
Subject: [PATCH 06/38] revert inadvertent change

---
 forc-pkg/src/pkg.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
index 458ce65b3a1..39198345fd2 100644
--- a/forc-pkg/src/pkg.rs
+++ b/forc-pkg/src/pkg.rs
@@ -25,7 +25,7 @@ use std::{
     collections::{hash_map, BTreeSet, HashMap, HashSet},
     fmt,
     fs::{self, File},
-    hash::{Hash, Hasher as StdHasher},
+    hash::{Hash, Hasher},
     io::Write,
     path::{Path, PathBuf},
     str::FromStr,

From 2fa315494ce3f8ec8a52501ff4fb11a7e705f918 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 12 Sep 2024 08:48:58 +0530
Subject: [PATCH 07/38] fix typos

---
 forc-test/src/execute.rs                               | 2 +-
 sway-core/src/asm_generation/fuel/programs/abstract.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forc-test/src/execute.rs b/forc-test/src/execute.rs
index 52dec2afe04..0fed0d96007 100644
--- a/forc-test/src/execute.rs
+++ b/forc-test/src/execute.rs
@@ -264,7 +264,7 @@ impl TestExecutor {
 /// ```
 fn patch_test_bytecode(bytecode: &[u8], test_offset: u32) -> std::borrow::Cow<[u8]> {
     // Each instruction is 4 bytes,
-    // so we divide the totaly byte-size by 4 to get the instruction offset.
+    // so we divide the total byte-size by 4 to get the instruction offset.
     const PROGRAM_START_INST_OFFSET: u32 = (sway_core::PRELUDE_SIZE_IN_BYTES / 4) as u32;
     const PROGRAM_START_BYTE_OFFSET: usize = sway_core::PRELUDE_SIZE_IN_BYTES;
 
diff --git a/sway-core/src/asm_generation/fuel/programs/abstract.rs b/sway-core/src/asm_generation/fuel/programs/abstract.rs
index fd4c14f0154..dbeeb2bd1fb 100644
--- a/sway-core/src/asm_generation/fuel/programs/abstract.rs
+++ b/sway-core/src/asm_generation/fuel/programs/abstract.rs
@@ -177,15 +177,15 @@ impl AbstractProgram {
     fn build_prologue(&mut self) -> AllocatedAbstractInstructionSet {
         const _: () = assert!(
             crate::PRELUDE_METADATA_OFFSET_IN_BYTES == 16,
-            "Inconsitency in the assumption of prelude organisation"
+            "Inconsistency in the assumption of prelude organisation"
         );
         const _: () = assert!(
             crate::PRELUDE_METADATA_SIZE_IN_BYTES == 32,
-            "Inconsitency in the assumption of prelude organisation"
+            "Inconsistency in the assumption of prelude organisation"
         );
         const _: () = assert!(
             crate::PRELUDE_SIZE_IN_BYTES == 56,
-            "Inconsitency in the assumption of prelude organisation"
+            "Inconsistency in the assumption of prelude organisation"
         );
         let label = self.reg_seqr.get_label();
         AllocatedAbstractInstructionSet {

From 1a2f85eee7e16041b3ea9ad5d9d6faaa99e2ec26 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 12 Sep 2024 09:22:26 +0530
Subject: [PATCH 08/38] fix bug in computing hash

---
 forc-pkg/src/pkg.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
index 39198345fd2..46d998e9932 100644
--- a/forc-pkg/src/pkg.rs
+++ b/forc-pkg/src/pkg.rs
@@ -1952,6 +1952,7 @@ pub fn compile(
         let mut hasher = std::hash::DefaultHasher::new();
         abi_json.hash(&mut hasher);
         let hash: [u8; 8] = hasher.finish().to_be_bytes();
+        let hash = [hash, hash, hash, hash].concat();
         for (index, byte) in md.iter_mut().enumerate() {
             *byte = hash[index];
         }

From 4e3a28618b85475e18427a25205ded79c4f664df Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 12 Sep 2024 09:23:45 +0530
Subject: [PATCH 09/38] update contract IDs

---
 .../array_of_structs_caller/src/main.sw                         | 2 +-
 .../require_contract_deployment/asset_ops_test/src/main.sw      | 2 +-
 .../require_contract_deployment/bal_opcode/src/main.sw          | 2 +-
 .../call_abi_with_tuples/src/main.sw                            | 2 +-
 .../require_contract_deployment/call_basic_storage/src/main.sw  | 2 +-
 .../call_contract_with_type_aliases/src/main.sw                 | 2 +-
 .../call_increment_contract/src/main.sw                         | 2 +-
 .../require_contract_deployment/call_storage_enum/src/main.sw   | 2 +-
 .../require_contract_deployment/caller_auth_test/src/main.sw    | 2 +-
 .../require_contract_deployment/caller_context_test/src/main.sw | 2 +-
 .../nested_struct_args_caller/src/main.sw                       | 2 +-
 .../storage_access_caller/src/main.sw                           | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
index aba7556d410..a1043ec5013 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x14ed3cd06c2947248f69d54bfa681fe40d26267be84df7e19e253622b7921bbe;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xf9f1fec713b977865880637fc24e58cda9e69f6e711ed8e5efe7de9ce51c88ec; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release
+const CONTRACT_ID = 0xc3ddf503af65135b5e7dfa0eca48c96717b52379a75ffeb9622719941dabeb9d; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release
 
 fn get_address() -> Option<std::address::Address> {
     Some(CONTRACT_ID.into())
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
index 02567676e67..723a6945f47 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
@@ -14,7 +14,7 @@ const FUEL_COIN_CONTRACT_ID = 0xf8c7b4d09f9964ab4c437ac7f5cbd6dbad7e1f218fce452c
 #[cfg(experimental_new_encoding = false)]
 const BALANCE_CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;
 #[cfg(experimental_new_encoding = true)]
-const BALANCE_CONTRACT_ID = 0xccf637b5b0071861f3074fcf963ef2339dab5d306d919b4c7e65024a7fbc64e6; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
+const BALANCE_CONTRACT_ID = 0xfcdea7606265aa15cb597c41ca93624eeb62c877855cf2fec416adf210819757; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
 
 fn main() -> bool {
     let default_gas = 1_000_000_000_000;
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
index a739f0d408c..0f02ce3d5a1 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
@@ -5,7 +5,7 @@ use balance_test_abi::BalanceTest;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xccf637b5b0071861f3074fcf963ef2339dab5d306d919b4c7e65024a7fbc64e6; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
+const CONTRACT_ID = 0xfcdea7606265aa15cb597c41ca93624eeb62c877855cf2fec416adf210819757; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
 
 fn main() -> bool {
     let balance_test_contract = abi(BalanceTest, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
index 57633b2de20..9dcbf8374df 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
@@ -6,7 +6,7 @@ use abi_with_tuples::{MyContract, Location, Person};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xfdc14550c8aee742cd556d0ab7f378b7be0d3b1e6e086c097352e94590d4ed02;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x0328999650df8c33503c894fd6ac49b0299c9d64147feb69daa1606521dbe86e; // AUTO-CONTRACT-ID ../../test_contracts/abi_with_tuples_contract --release
+const CONTRACT_ID = 0x4fc52fadc57b9782e4a0dd8a877fd84ed683f2457a27c2510e01527c1a6d07ec; // AUTO-CONTRACT-ID ../../test_contracts/abi_with_tuples_contract --release
 
 fn main() -> bool {
     let the_abi = abi(MyContract, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
index 4e2144117af..66d0d0f77df 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
@@ -4,7 +4,7 @@ use basic_storage_abi::{BasicStorage, Quad};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x94db39f409a31b9f2ebcadeea44378e419208c20de90f5d8e1e33dc1523754cb;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x23afacfc8eaa13d36c3f2f4d764b66e53d284e4cd31477e8bd72b4ccc411022b; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
+const CONTRACT_ID = 0x2b8eb25abb6127c62c10fb80d3a2eee279f1d5f3108524bad6626429ff10d1cc; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
 
 fn main() -> u64 {
     let addr = abi(BasicStorage, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
index aacf8538eba..101d0d92379 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
@@ -5,7 +5,7 @@ use contract_with_type_aliases_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x0cbeb6efe3104b460be769bdc4ea101ebf16ccc16f2d7b667ec3e1c7f5ce35b5;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xfffcb364f01ce902477fa73720ae48bfb8bc735447f75d55d441a76943a27a65; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release
+const CONTRACT_ID = 0x56f52b5159c54b0530cbb9df293fd808bf56b96fee0a7a323b3fb0129cb60bae; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release
 
 fn main() {
     let caller = abi(MyContract, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
index 85deb2bb2ba..bda4b3d6208 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
@@ -6,7 +6,7 @@ use dynamic_contract_call::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xd1b4047af7ef111c023ab71069e01dc2abfde487c0a0ce1268e4f447e6c6e4c2;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x5229470a8bb907a909aba79325a347bd8849a8aceb9c8116e3d1c73ea4977b6d; // AUTO-CONTRACT-ID ../../test_contracts/increment_contract --release
+const CONTRACT_ID = 0xd2ab897f79d8a2eab9fd541231562ba6eba391a312975b7479b3f5e9af131702; // AUTO-CONTRACT-ID ../../test_contracts/increment_contract --release
 
 fn main() -> bool {
     let the_abi = abi(Incrementor, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
index ac6240cfd81..943b34bafcb 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
@@ -5,7 +5,7 @@ use storage_enum_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xc601d11767195485a6654d566c67774134668863d8c797a8c69e8778fb1f89e9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x4bb9cb0a4b3df7981e702609cbce4b684b3d9c21e474e9988825f48fae81b06d; // AUTO-CONTRACT-ID ../../test_contracts/storage_enum_contract --release
+const CONTRACT_ID = 0x87cd39b7572475be5271db9a7f1560a01e500825db981c64a74fb9c2a021d241; // AUTO-CONTRACT-ID ../../test_contracts/storage_enum_contract --release
 
 fn main() -> u64 {
     let caller = abi(StorageEnum, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
index 6b47bf9d3a1..aff2931f411 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
@@ -5,7 +5,7 @@ use auth_testing_abi::AuthTesting;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xc2eec20491b53aab7232cbd27c31d15417b4e9daf0b89c74cc242ef1295f681f;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xbbd538c6fc4f6a805b4e178529e1460453aee648b5e49949bdfc8a12a585e7d2; // AUTO-CONTRACT-ID ../../test_contracts/auth_testing_contract --release
+const CONTRACT_ID = 0x719f46fab0a55f32fb84b237ab3b777ceb0247bdac5fdd1a3be377e3f6c5a022; // AUTO-CONTRACT-ID ../../test_contracts/auth_testing_contract --release
 
 // should be false in the case of a script
 fn main() -> bool {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
index 8da2675ccda..0a3676ee83c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
@@ -6,7 +6,7 @@ use context_testing_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x6054c11cda000f5990373a4d61929396165be4dfdd61d5b7bd26da60ab0d8577;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x7821bf368390972d4892e1f382fd954fea5b567e533eed6fac0f173800647945; // AUTO-CONTRACT-ID ../../test_contracts/context_testing_contract --release
+const CONTRACT_ID = 0x48b28240a8aca8a9e903fa3a28b835947112e701ba566ce99a97d7df35495965; // AUTO-CONTRACT-ID ../../test_contracts/context_testing_contract --release
 
 fn main() -> bool {
     let gas: u64 = u64::max();
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
index ed163d5076d..8e1349c32e2 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
@@ -5,7 +5,7 @@ use nested_struct_args_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xe63d33a1b3a6903808b379f6a41a72fa8a370e8b76626775e7d9d2f9c4c5da40;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x90fdb746b560d271261d8fab6eba6a4381f173432b7fa8c93e2765c38bca508b; // AUTO-CONTRACT-ID ../../test_contracts/nested_struct_args_contract --release
+const CONTRACT_ID = 0x9a4da0e9d8e7f4b7c9375ff94938df861b99e53c1644a881227ba93272665de6; // AUTO-CONTRACT-ID ../../test_contracts/nested_struct_args_contract --release
 
 fn main() -> bool {
     let caller = abi(NestedStructArgs, CONTRACT_ID);
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 eb9d9d24411..30f59986960 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
@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x3bc28acd66d327b8c1b9624c1fabfc07e9ffa1b5d71c2832c3bfaaf8f4b805e9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x3da675876942326fd4c66b079216742f75e5f15681271a5db54a9cf19a813b22; // AUTO-CONTRACT-ID ../../test_contracts/storage_access_contract --release
+const CONTRACT_ID = 0x87e563e3484e325a3e5809b08e034b12000ed7dfda68912105832ad830e0e9a3; // AUTO-CONTRACT-ID ../../test_contracts/storage_access_contract --release
 
 fn main() -> bool {
     let caller = abi(StorageAccess, CONTRACT_ID);

From e1944a94ac91968ed53c8b4e0df238df7e978119 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 12 Sep 2024 09:32:57 +0530
Subject: [PATCH 10/38] update configurable_consts abi json

---
 .../json_abi_oracle_new_encoding.json         | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
index 0662cd80d0d..d6ed0baf448 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
@@ -62,82 +62,82 @@
     {
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
       "name": "BOOL",
-      "offset": 7208
+      "offset": 7240
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "U8",
-      "offset": 7400
+      "offset": 7432
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "ANOTHER_U8",
-      "offset": 7136
+      "offset": 7168
     },
     {
       "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
       "name": "U16",
-      "offset": 7344
+      "offset": 7376
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
       "name": "U32",
-      "offset": 7384
+      "offset": 7416
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
       "name": "U64",
-      "offset": 7392
+      "offset": 7424
     },
     {
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
       "name": "U256",
-      "offset": 7352
+      "offset": 7384
     },
     {
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
       "name": "B256",
-      "offset": 7176
+      "offset": 7208
     },
     {
       "concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff",
       "name": "CONFIGURABLE_STRUCT",
-      "offset": 7296
+      "offset": 7328
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
       "name": "CONFIGURABLE_ENUM_A",
-      "offset": 7216
+      "offset": 7248
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
       "name": "CONFIGURABLE_ENUM_B",
-      "offset": 7256
+      "offset": 7288
     },
     {
       "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6",
       "name": "ARRAY_BOOL",
-      "offset": 7144
+      "offset": 7176
     },
     {
       "concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199",
       "name": "ARRAY_U64",
-      "offset": 7152
+      "offset": 7184
     },
     {
       "concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be",
       "name": "TUPLE_BOOL_U64",
-      "offset": 7328
+      "offset": 7360
     },
     {
       "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
       "name": "STR_4",
-      "offset": 7320
+      "offset": 7352
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "NOT_USED",
-      "offset": 7312
+      "offset": 7344
     }
   ],
   "encodingVersion": "1",

From ded969b274e898a2d876296d972527426f252c09 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 12 Sep 2024 12:53:37 +0530
Subject: [PATCH 11/38] update tests

---
 .../language/u256/u256_abi/json_abi_oracle_new_encoding.json    | 2 +-
 .../require_contract_deployment/asset_ops_test/src/main.sw      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
index 49a75d8d5c1..315654e4e3e 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
@@ -9,7 +9,7 @@
     {
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
       "name": "SOME_U256",
-      "offset": 816
+      "offset": 848
     }
   ],
   "encodingVersion": "1",
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
index 723a6945f47..6c2d4cc9770 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
@@ -9,7 +9,7 @@ use test_fuel_coin_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const FUEL_COIN_CONTRACT_ID = 0xec2277ebe007ade87e3d797c3b1e070dcd542d5ef8f038b471f262ef9cebc87c;
 #[cfg(experimental_new_encoding = true)]
-const FUEL_COIN_CONTRACT_ID = 0xf8c7b4d09f9964ab4c437ac7f5cbd6dbad7e1f218fce452c5807aac3c67afa6f;
+const FUEL_COIN_CONTRACT_ID = 0xf4c6a01dca21e0a261e89bf9df148f8216ca8e50ae5d3f2c6bc632300e8f9296; // AUTO-CONTRACT-ID ../../test_contracts/test_fuel_coin_contract --release
 
 #[cfg(experimental_new_encoding = false)]
 const BALANCE_CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;

From 7405df71655018b2e377b891bd02822fc3f068df Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 12 Sep 2024 13:53:15 +0530
Subject: [PATCH 12/38] fix asset_ops_test

---
 .../require_contract_deployment/asset_ops_test/src/main.sw      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
index 57ed45260cf..4be32f58cf1 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
@@ -9,7 +9,7 @@ use test_fuel_coin_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const FUEL_COIN_CONTRACT_ID = 0xec2277ebe007ade87e3d797c3b1e070dcd542d5ef8f038b471f262ef9cebc87c;
 #[cfg(experimental_new_encoding = true)]
-const FUEL_COIN_CONTRACT_ID = 0xf2fecff29038dab2ef571397ea5507359265c9154608e7de36ccbea20ed5c8aa;
+const FUEL_COIN_CONTRACT_ID = 0x0c4cde0b9ae10f8949845fcfd2d0e10fcd172751ff4c2cb8ea54ad87542af49b;
 
 #[cfg(experimental_new_encoding = false)]
 const BALANCE_CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;

From 798e03cb559f55b5379f79be89caa9ee459d00d9 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 26 Sep 2024 16:57:04 +0530
Subject: [PATCH 13/38] set first word of metadata to offset to configurables
 in data-section

---
 forc-pkg/src/pkg.rs                           |  16 +-
 forc/src/cli/commands/parse_bytecode.rs       |   4 +
 sway-core/src/asm_generation/finalized_asm.rs |  19 +-
 .../allocated_abstract_instruction_set.rs     |  18 +-
 .../src/asm_generation/fuel/data_section.rs   | 181 +++++++++++++-----
 .../asm_generation/fuel/fuel_asm_builder.rs   |  17 +-
 .../src/asm_generation/fuel/functions.rs      |  22 ++-
 .../asm_generation/fuel/programs/abstract.rs  |   6 +-
 8 files changed, 195 insertions(+), 88 deletions(-)

diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
index 46d998e9932..3f4327ec188 100644
--- a/forc-pkg/src/pkg.rs
+++ b/forc-pkg/src/pkg.rs
@@ -1931,6 +1931,7 @@ pub fn compile(
     // TODO: This should probably be in `fuel_abi_json::generate_json_abi_program`?
     // If ABI requires knowing config offsets, they should be inputs to ABI gen.
     if let ProgramABI::Fuel(ref mut program_abi) = program_abi {
+        let mut configurables_offset = compiled.bytecode.len() as u64;
         if let Some(ref mut configurables) = program_abi.configurables {
             // Filter out all dead configurables (i.e. ones without offsets in the bytecode)
             configurables.retain(|c| {
@@ -1940,21 +1941,20 @@ pub fn compile(
             });
             // Set the actual offsets in the JSON object
             for (config, offset) in &compiled.named_data_section_entries_offsets {
+                if *offset < configurables_offset {
+                    configurables_offset = *offset;
+                }
                 if let Some(idx) = configurables.iter().position(|c| &c.name == config) {
                     configurables[idx].offset = *offset;
                 }
             }
         }
 
-        // Set metadata to a hash of the ABI.
-        // TODO: Do the right thing. This is just a placeholder.
-        let abi_json = serde_json::to_string_pretty(&program_abi)?;
-        let mut hasher = std::hash::DefaultHasher::new();
-        abi_json.hash(&mut hasher);
-        let hash: [u8; 8] = hasher.finish().to_be_bytes();
-        let hash = [hash, hash, hash, hash].concat();
+        let configurables_offset: [u8; 8] = configurables_offset.to_be_bytes();
+        let zeroes = 0u64.to_be_bytes();
+        let metadata = [configurables_offset, zeroes, zeroes, zeroes].concat();
         for (index, byte) in md.iter_mut().enumerate() {
-            *byte = hash[index];
+            *byte = metadata[index];
         }
     }
 
diff --git a/forc/src/cli/commands/parse_bytecode.rs b/forc/src/cli/commands/parse_bytecode.rs
index f4a30c82d6d..a025520b085 100644
--- a/forc/src/cli/commands/parse_bytecode.rs
+++ b/forc/src/cli/commands/parse_bytecode.rs
@@ -59,6 +59,10 @@ pub(crate) fn exec(command: Command) -> ForcResult<()> {
                     parsed_raw
                 )
             }
+            Err(fuel_asm::InvalidOpcode) if word_ix >= 4 && word_ix < 12 => {
+                let parsed_raw = u32::from_be_bytes([raw[0], raw[1], raw[2], raw[3]]);
+                format!("Metadata[{}] ({})", word_ix - 4, parsed_raw)
+            }
             Ok(_) | Err(fuel_asm::InvalidOpcode) => "".into(),
         };
         table.add_row(Row::new(vec![
diff --git a/sway-core/src/asm_generation/finalized_asm.rs b/sway-core/src/asm_generation/finalized_asm.rs
index 2625e04e9fb..7a5f883e6c0 100644
--- a/sway-core/src/asm_generation/finalized_asm.rs
+++ b/sway-core/src/asm_generation/finalized_asm.rs
@@ -4,7 +4,7 @@ use super::{
     fuel::{checks, data_section::DataSection},
     ProgramABI, ProgramKind,
 };
-use crate::asm_generation::fuel::data_section::{DataId, Datum, Entry};
+use crate::asm_generation::fuel::data_section::{Datum, Entry, EntryName};
 use crate::asm_lang::allocated_ops::{AllocatedOp, AllocatedOpcode, FuelAsmData};
 use crate::decl_engine::DeclRefFunction;
 use crate::source_map::SourceMap;
@@ -316,9 +316,9 @@ fn to_bytecode_mut(
             };
         }
 
-        for (i, entry) in data_section.value_pairs.iter().enumerate() {
-            let entry_offset = data_section.data_id_to_offset(&DataId(i as u32));
-            print_entry(indentation, offset + entry_offset, entry);
+        for (i, entry) in data_section.iter_all_entries().enumerate() {
+            let entry_offset = data_section.absolute_idx_to_offset(i);
+            print_entry(indentation, offset + entry_offset, &entry);
         }
 
         println!(";; --- END OF TARGET BYTECODE ---\n");
@@ -327,16 +327,19 @@ fn to_bytecode_mut(
     assert_eq!(half_word_ix * 4, offset_to_data_section_in_bytes as usize);
     assert_eq!(bytecode.len(), offset_to_data_section_in_bytes as usize);
 
+    let num_nonconfigurables = data_section.non_configurables.len();
     let named_data_section_entries_offsets = data_section
-        .value_pairs
+        .configurables
         .iter()
         .enumerate()
-        .filter(|entry| entry.1.name.is_some())
         .map(|(id, entry)| {
+            let EntryName::Configurable(name) = &entry.name else {
+                panic!("Non-configurable in configurables part of datasection");
+            };
             (
-                entry.name.as_ref().unwrap().clone(),
+                name.clone(),
                 offset_to_data_section_in_bytes
-                    + data_section.raw_data_id_to_offset(id as u32) as u64,
+                    + data_section.absolute_idx_to_offset(id + num_nonconfigurables) as u64,
             )
         })
         .collect::<BTreeMap<String, u64>>();
diff --git a/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs b/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs
index c719818c381..1e0988bd6c7 100644
--- a/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs
+++ b/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs
@@ -1,7 +1,10 @@
-use crate::asm_lang::{
-    allocated_ops::{AllocatedOpcode, AllocatedRegister},
-    AllocatedAbstractOp, ConstantRegister, ControlFlowOp, Label, RealizedOp, VirtualImmediate12,
-    VirtualImmediate18, VirtualImmediate24,
+use crate::{
+    asm_generation::fuel::data_section::EntryName,
+    asm_lang::{
+        allocated_ops::{AllocatedOpcode, AllocatedRegister},
+        AllocatedAbstractOp, ConstantRegister, ControlFlowOp, Label, RealizedOp,
+        VirtualImmediate12, VirtualImmediate18, VirtualImmediate24,
+    },
 };
 
 use super::{
@@ -346,8 +349,11 @@ impl AllocatedAbstractInstructionSet {
                         // We compute the relative offset w.r.t the actual jump.
                         // Sub 1 because the relative jumps add a 1.
                         let offset = rel_offset(curr_offset + 1, lab) - 1;
-                        let data_id =
-                            data_section.insert_data_value(Entry::new_word(offset, None, None));
+                        let data_id = data_section.insert_data_value(Entry::new_word(
+                            offset,
+                            EntryName::NonConfigurable,
+                            None,
+                        ));
                         realized_ops.push(RealizedOp {
                             opcode: AllocatedOpcode::LoadDataId(r1, data_id),
                             owning_span,
diff --git a/sway-core/src/asm_generation/fuel/data_section.rs b/sway-core/src/asm_generation/fuel/data_section.rs
index 3db12443f4f..dbd80c74d0b 100644
--- a/sway-core/src/asm_generation/fuel/data_section.rs
+++ b/sway-core/src/asm_generation/fuel/data_section.rs
@@ -2,15 +2,28 @@ use sway_ir::{size_bytes_round_up_to_word_alignment, Constant, ConstantValue, Co
 
 use std::{fmt, iter::repeat};
 
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum EntryName {
+    NonConfigurable,
+    Configurable(String),
+}
+
+impl fmt::Display for EntryName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            EntryName::NonConfigurable => write!(f, "NonConfigurable"),
+            EntryName::Configurable(name) => write!(f, "<Configurable, {}>", name),
+        }
+    }
+}
+
 // An entry in the data section.  It's important for the size to be correct, especially for unions
 // where the size could be larger than the represented value.
 #[derive(Clone, Debug)]
 pub struct Entry {
     pub value: Datum,
     pub padding: Padding,
-    // It is assumed, for now, that only configuration-time constants have a name. Otherwise, this
-    // is `None`.
-    pub name: Option<String>,
+    pub name: EntryName,
 }
 
 #[derive(Clone, Debug)]
@@ -23,7 +36,7 @@ pub enum Datum {
 }
 
 impl Entry {
-    pub(crate) fn new_byte(value: u8, name: Option<String>, padding: Option<Padding>) -> Entry {
+    pub(crate) fn new_byte(value: u8, name: EntryName, padding: Option<Padding>) -> Entry {
         Entry {
             value: Datum::Byte(value),
             padding: padding.unwrap_or(Padding::default_for_u8(value)),
@@ -31,7 +44,7 @@ impl Entry {
         }
     }
 
-    pub(crate) fn new_word(value: u64, name: Option<String>, padding: Option<Padding>) -> Entry {
+    pub(crate) fn new_word(value: u64, name: EntryName, padding: Option<Padding>) -> Entry {
         Entry {
             value: Datum::Word(value),
             padding: padding.unwrap_or(Padding::default_for_u64(value)),
@@ -41,7 +54,7 @@ impl Entry {
 
     pub(crate) fn new_byte_array(
         bytes: Vec<u8>,
-        name: Option<String>,
+        name: EntryName,
         padding: Option<Padding>,
     ) -> Entry {
         Entry {
@@ -51,11 +64,7 @@ impl Entry {
         }
     }
 
-    pub(crate) fn new_slice(
-        bytes: Vec<u8>,
-        name: Option<String>,
-        padding: Option<Padding>,
-    ) -> Entry {
+    pub(crate) fn new_slice(bytes: Vec<u8>, name: EntryName, padding: Option<Padding>) -> Entry {
         Entry {
             padding: padding.unwrap_or(Padding::default_for_byte_array(&bytes)),
             value: Datum::Slice(bytes),
@@ -65,7 +74,7 @@ impl Entry {
 
     pub(crate) fn new_collection(
         elements: Vec<Entry>,
-        name: Option<String>,
+        name: EntryName,
         padding: Option<Padding>,
     ) -> Entry {
         Entry {
@@ -80,7 +89,7 @@ impl Entry {
     pub(crate) fn from_constant(
         context: &Context,
         constant: &Constant,
-        name: Option<String>,
+        name: EntryName,
         padding: Option<Padding>,
     ) -> Entry {
         // We need a special handling in case of enums.
@@ -89,8 +98,9 @@ impl Entry {
                 .enum_tag_and_value_with_paddings(context)
                 .expect("Constant is an enum.");
 
-            let tag_entry = Entry::from_constant(context, tag.0, None, tag.1);
-            let value_entry = Entry::from_constant(context, value.0, None, value.1);
+            let tag_entry = Entry::from_constant(context, tag.0, EntryName::NonConfigurable, tag.1);
+            let value_entry =
+                Entry::from_constant(context, value.0, EntryName::NonConfigurable, value.1);
 
             return Entry::new_collection(vec![tag_entry, value_entry], name, padding);
         }
@@ -118,7 +128,9 @@ impl Entry {
                     .array_elements_with_padding(context)
                     .expect("Constant is an array.")
                     .into_iter()
-                    .map(|(elem, padding)| Entry::from_constant(context, elem, None, padding))
+                    .map(|(elem, padding)| {
+                        Entry::from_constant(context, elem, EntryName::NonConfigurable, padding)
+                    })
                     .collect(),
                 name,
                 padding,
@@ -128,7 +140,9 @@ impl Entry {
                     .struct_fields_with_padding(context)
                     .expect("Constant is a struct.")
                     .into_iter()
-                    .map(|(elem, padding)| Entry::from_constant(context, elem, None, padding))
+                    .map(|(elem, padding)| {
+                        Entry::from_constant(context, elem, EntryName::NonConfigurable, padding)
+                    })
                     .collect(),
                 name,
                 padding,
@@ -198,45 +212,91 @@ impl Entry {
     }
 }
 
+#[derive(Clone, Debug)]
+pub enum DataIdEntryKind {
+    NonConfigurable,
+    Configurable,
+}
+
+impl fmt::Display for DataIdEntryKind {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            DataIdEntryKind::NonConfigurable => write!(f, "NonConfigurable"),
+            DataIdEntryKind::Configurable => write!(f, "Configurable"),
+        }
+    }
+}
+
 /// An address which refers to a value in the data section of the asm.
 #[derive(Clone, Debug)]
-pub(crate) struct DataId(pub(crate) u32);
+pub(crate) struct DataId {
+    pub(crate) idx: u32,
+    pub(crate) kind: DataIdEntryKind,
+}
 
 impl fmt::Display for DataId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "data_{}", self.0)
+        write!(f, "data_{}_{}", self.kind, self.idx)
     }
 }
 
+/// The data to be put in the data section of the asm
 #[derive(Default, Clone, Debug)]
 pub struct DataSection {
-    /// the data to be put in the data section of the asm
-    pub value_pairs: Vec<Entry>,
+    pub non_configurables: Vec<Entry>,
+    pub configurables: Vec<Entry>,
 }
 
 impl DataSection {
+    /// Get the number of entries
+    pub(crate) fn num_entries(&self) -> usize {
+        self.non_configurables.len() + self.configurables.len()
+    }
+
+    /// Iterate over all entries, non-configurables followed by configurables
+    pub(crate) fn iter_all_entries(&self) -> impl Iterator<Item = Entry> + '_ {
+        self.non_configurables
+            .iter()
+            .chain(self.configurables.iter())
+            .cloned()
+    }
+
+    /// Get the absolute index of an id
+    fn absolute_idx(&self, id: &DataId) -> usize {
+        match id.kind {
+            DataIdEntryKind::NonConfigurable => id.idx as usize,
+            DataIdEntryKind::Configurable => id.idx as usize + self.non_configurables.len(),
+        }
+    }
+
+    /// Get entry at id
+    fn get(&self, id: &DataId) -> Option<&Entry> {
+        match id.kind {
+            DataIdEntryKind::NonConfigurable => self.non_configurables.get(id.idx as usize),
+            DataIdEntryKind::Configurable => self.non_configurables.get(id.idx as usize),
+        }
+    }
+
     /// Given a [DataId], calculate the offset _from the beginning of the data section_ to the data
     /// in bytes.
     pub(crate) fn data_id_to_offset(&self, id: &DataId) -> usize {
-        self.raw_data_id_to_offset(id.0)
+        let idx = self.absolute_idx(id);
+        self.absolute_idx_to_offset(idx)
     }
 
-    /// Given a [DataId], calculate the offset _from the beginning of the data section_ to the data
+    /// Given an absolute index, calculate the offset _from the beginning of the data section_ to the data
     /// in bytes.
-    pub(crate) fn raw_data_id_to_offset(&self, id: u32) -> usize {
-        self.value_pairs
-            .iter()
-            .take(id as usize)
-            .fold(0, |offset, entry| {
-                //entries must be word aligned
-                size_bytes_round_up_to_word_alignment!(offset + entry.to_bytes().len())
-            })
+    pub(crate) fn absolute_idx_to_offset(&self, idx: usize) -> usize {
+        self.iter_all_entries().take(idx).fold(0, |offset, entry| {
+            //entries must be word aligned
+            size_bytes_round_up_to_word_alignment!(offset + entry.to_bytes().len())
+        })
     }
 
     pub(crate) fn serialize_to_bytes(&self) -> Vec<u8> {
         // not the exact right capacity but serves as a lower bound
-        let mut buf = Vec::with_capacity(self.value_pairs.len());
-        for entry in &self.value_pairs {
+        let mut buf = Vec::with_capacity(self.num_entries());
+        for entry in self.iter_all_entries() {
             buf.append(&mut entry.to_bytes());
 
             //entries must be word aligned
@@ -248,16 +308,12 @@ impl DataSection {
 
     /// Returns whether a specific [DataId] value has a copy type (fits in a register).
     pub(crate) fn has_copy_type(&self, id: &DataId) -> Option<bool> {
-        self.value_pairs
-            .get(id.0 as usize)
-            .map(|entry| entry.has_copy_type())
+        self.get(id).map(|entry| entry.has_copy_type())
     }
 
     /// Returns whether a specific [DataId] value is a byte entry.
     pub(crate) fn is_byte(&self, id: &DataId) -> Option<bool> {
-        self.value_pairs
-            .get(id.0 as usize)
-            .map(|entry| entry.is_byte())
+        self.get(id).map(|entry| entry.is_byte())
     }
 
     /// When generating code, sometimes a hard-coded data pointer is needed to reference
@@ -268,31 +324,49 @@ impl DataSection {
     /// relative to the current (load) instruction.
     pub(crate) fn append_pointer(&mut self, pointer_value: u64) -> DataId {
         // The 'pointer' is just a literal 64 bit address.
-        self.insert_data_value(Entry::new_word(pointer_value, None, None))
+        self.insert_data_value(Entry::new_word(
+            pointer_value,
+            EntryName::NonConfigurable,
+            None,
+        ))
     }
 
     /// Given any data in the form of a [Literal] (using this type mainly because it includes type
-    /// information and debug spans), insert it into the data section and return its offset as a
+    /// information and debug spans), insert it into the data section and return its handle as
     /// [DataId].
     pub(crate) fn insert_data_value(&mut self, new_entry: Entry) -> DataId {
         // if there is an identical data value, use the same id
-        match self
-            .value_pairs
-            .iter()
-            .position(|entry| entry.equiv(&new_entry))
-        {
-            Some(num) => DataId(num as u32),
+
+        let (value_pairs, kind) = match new_entry.name {
+            EntryName::NonConfigurable => (
+                &mut self.non_configurables,
+                DataIdEntryKind::NonConfigurable,
+            ),
+            EntryName::Configurable(_) => (&mut self.configurables, DataIdEntryKind::Configurable),
+        };
+        match value_pairs.iter().position(|entry| entry.equiv(&new_entry)) {
+            Some(num) => DataId {
+                idx: num as u32,
+                kind,
+            },
             None => {
-                self.value_pairs.push(new_entry);
+                value_pairs.push(new_entry);
                 // the index of the data section where the value is stored
-                DataId((self.value_pairs.len() - 1) as u32)
+                DataId {
+                    idx: (value_pairs.len() - 1) as u32,
+                    kind,
+                }
             }
         }
     }
 
     // If the stored data is Datum::Word, return the inner value.
     pub(crate) fn get_data_word(&self, data_id: &DataId) -> Option<u64> {
-        self.value_pairs.get(data_id.0 as usize).and_then(|entry| {
+        let value_pairs = match data_id.kind {
+            DataIdEntryKind::NonConfigurable => &self.non_configurables,
+            DataIdEntryKind::Configurable => &self.configurables,
+        };
+        value_pairs.get(data_id.idx as usize).and_then(|entry| {
             if let Datum::Word(w) = entry.value {
                 Some(w)
             } else {
@@ -322,11 +396,12 @@ impl fmt::Display for DataSection {
 
         use std::fmt::Write;
         let mut data_buf = String::new();
-        for (ix, entry) in self.value_pairs.iter().enumerate() {
+        for (ix, entry) in self.iter_all_entries().enumerate() {
             writeln!(
                 data_buf,
-                "{} {}",
-                DataId(ix as u32),
+                "{}: {} {}",
+                ix,
+                entry.name,
                 display_entry(&entry.value)
             )?;
         }
diff --git a/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs b/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs
index a97ff923635..8761d535267 100644
--- a/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs
+++ b/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs
@@ -1,4 +1,5 @@
 use super::{
+    data_section::EntryName,
     globals_section::GlobalsSection,
     programs::{AbstractEntry, AbstractProgram},
 };
@@ -98,7 +99,12 @@ impl<'ir, 'eng> AsmBuilder for FuelAsmBuilder<'ir, 'eng> {
     fn compile_configurable(&mut self, config: &ConfigContent) {
         match config {
             ConfigContent::V0 { name, constant, .. } => {
-                let entry = Entry::from_constant(self.context, constant, Some(name.clone()), None);
+                let entry = Entry::from_constant(
+                    self.context,
+                    constant,
+                    EntryName::Configurable(name.clone()),
+                    None,
+                );
                 let dataid = self.data_section.insert_data_value(entry);
                 self.configurable_v0_data_id.insert(name.clone(), dataid);
             }
@@ -117,7 +123,7 @@ impl<'ir, 'eng> AsmBuilder for FuelAsmBuilder<'ir, 'eng> {
                 let (decode_fn_label, _) = self.func_label_map.get(decode_fn).unwrap();
                 let dataid = self.data_section.insert_data_value(Entry::new_byte_array(
                     encoded_bytes.clone(),
-                    Some(name.clone()),
+                    EntryName::Configurable(name.clone()),
                     None,
                 ));
 
@@ -2059,6 +2065,11 @@ impl<'ir, 'eng> FuelAsmBuilder<'ir, 'eng> {
 
             _otherwise => {
                 // Get the constant into the namespace.
+                let config_name = if let Some(name) = config_name {
+                    EntryName::Configurable(name)
+                } else {
+                    EntryName::NonConfigurable
+                };
                 let entry = Entry::from_constant(self.context, constant, config_name, None);
                 let data_id = self.data_section.insert_data_value(entry);
 
@@ -2181,7 +2192,7 @@ impl<'ir, 'eng> FuelAsmBuilder<'ir, 'eng> {
             let comment = comment.into();
             let data_id = self
                 .data_section
-                .insert_data_value(Entry::new_word(imm, None, None));
+                .insert_data_value(Entry::new_word(imm, EntryName::NonConfigurable, None));
             self.cur_bytecode.push(Op {
                 opcode: Either::Left(VirtualOp::LoadDataId(reg.clone(), data_id)),
                 owning_span: span.clone(),
diff --git a/sway-core/src/asm_generation/fuel/functions.rs b/sway-core/src/asm_generation/fuel/functions.rs
index a53860e4204..ac0476edecb 100644
--- a/sway-core/src/asm_generation/fuel/functions.rs
+++ b/sway-core/src/asm_generation/fuel/functions.rs
@@ -26,7 +26,7 @@ use sway_error::{
 };
 use sway_types::{Ident, Span};
 
-use super::compiler_constants::NUM_ARG_REGISTERS;
+use super::{compiler_constants::NUM_ARG_REGISTERS, data_section::EntryName};
 
 /// A summary of the adopted calling convention:
 ///
@@ -825,9 +825,13 @@ impl<'ir, 'eng> FuelAsmBuilder<'ir, 'eng> {
                             );
                         }
                         _ => {
-                            let data_id = self.data_section.insert_data_value(
-                                Entry::from_constant(self.context, constant, None, None),
-                            );
+                            let data_id =
+                                self.data_section.insert_data_value(Entry::from_constant(
+                                    self.context,
+                                    constant,
+                                    EntryName::NonConfigurable,
+                                    None,
+                                ));
                             self.ptr_map.insert(*ptr, Storage::Data(data_id));
                         }
                     }
@@ -853,9 +857,13 @@ impl<'ir, 'eng> FuelAsmBuilder<'ir, 'eng> {
                                 });
                             }
                             _ => {
-                                let data_id = self.data_section.insert_data_value(
-                                    Entry::from_constant(self.context, constant, None, None),
-                                );
+                                let data_id =
+                                    self.data_section.insert_data_value(Entry::from_constant(
+                                        self.context,
+                                        constant,
+                                        EntryName::NonConfigurable,
+                                        None,
+                                    ));
 
                                 init_mut_vars.push(InitMutVars {
                                     stack_base_words,
diff --git a/sway-core/src/asm_generation/fuel/programs/abstract.rs b/sway-core/src/asm_generation/fuel/programs/abstract.rs
index dbeeb2bd1fb..3480c565472 100644
--- a/sway-core/src/asm_generation/fuel/programs/abstract.rs
+++ b/sway-core/src/asm_generation/fuel/programs/abstract.rs
@@ -5,7 +5,7 @@ use crate::{
             abstract_instruction_set::AbstractInstructionSet,
             allocated_abstract_instruction_set::AllocatedAbstractInstructionSet,
             compiler_constants,
-            data_section::{DataSection, Entry},
+            data_section::{DataSection, Entry, EntryName},
             globals_section::GlobalsSection,
             register_sequencer::RegisterSequencer,
         },
@@ -75,7 +75,7 @@ impl AbstractProgram {
     pub(crate) fn is_empty(&self) -> bool {
         self.non_entries.is_empty()
             && self.entries.is_empty()
-            && self.data_section.value_pairs.is_empty()
+            && self.data_section.iter_all_entries().next().is_none()
     }
 
     /// Adds prologue, globals allocation, before entries, contract method switch, and allocates virtual register
@@ -302,7 +302,7 @@ impl AbstractProgram {
             // Put the selector in the data section.
             let data_label = self.data_section.insert_data_value(Entry::new_word(
                 u32::from_be_bytes(selector) as u64,
-                None,
+                EntryName::NonConfigurable,
                 None,
             ));
 

From dd7a91d4bff75df23e6efa5cec0230c58e546c34 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 26 Sep 2024 17:09:34 +0530
Subject: [PATCH 14/38] update deployment tests

---
 .../array_of_structs_caller/src/main.sw                         | 2 +-
 .../require_contract_deployment/asset_ops_test/src/main.sw      | 2 +-
 .../require_contract_deployment/bal_opcode/src/main.sw          | 2 +-
 .../call_abi_with_tuples/src/main.sw                            | 2 +-
 .../require_contract_deployment/call_basic_storage/src/main.sw  | 2 +-
 .../call_contract_with_type_aliases/src/main.sw                 | 2 +-
 .../call_increment_contract/src/main.sw                         | 2 +-
 .../require_contract_deployment/call_storage_enum/src/main.sw   | 2 +-
 .../require_contract_deployment/caller_auth_test/src/main.sw    | 2 +-
 .../require_contract_deployment/caller_context_test/src/main.sw | 2 +-
 .../nested_struct_args_caller/src/main.sw                       | 2 +-
 .../storage_access_caller/src/main.sw                           | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
index a1043ec5013..4d992d2460f 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x14ed3cd06c2947248f69d54bfa681fe40d26267be84df7e19e253622b7921bbe;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xc3ddf503af65135b5e7dfa0eca48c96717b52379a75ffeb9622719941dabeb9d; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release
+const CONTRACT_ID = 0xc89bc49478ca8e66d9b5223318e791213fa176ad722ad1a263f5e26795fce610; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release
 
 fn get_address() -> Option<std::address::Address> {
     Some(CONTRACT_ID.into())
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
index 4be32f58cf1..8896bb02abd 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
@@ -14,7 +14,7 @@ const FUEL_COIN_CONTRACT_ID = 0x0c4cde0b9ae10f8949845fcfd2d0e10fcd172751ff4c2cb8
 #[cfg(experimental_new_encoding = false)]
 const BALANCE_CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;
 #[cfg(experimental_new_encoding = true)]
-const BALANCE_CONTRACT_ID = 0xfcdea7606265aa15cb597c41ca93624eeb62c877855cf2fec416adf210819757; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
+const BALANCE_CONTRACT_ID = 0x286d6fd47a053a81fd99c22ce0f5b6cf3ad566015a77db13f8e94b3392580526; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
 
 fn main() -> bool {
     let default_gas = 1_000_000_000_000;
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
index 0f02ce3d5a1..6493b92b1e7 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
@@ -5,7 +5,7 @@ use balance_test_abi::BalanceTest;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xfcdea7606265aa15cb597c41ca93624eeb62c877855cf2fec416adf210819757; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
+const CONTRACT_ID = 0x286d6fd47a053a81fd99c22ce0f5b6cf3ad566015a77db13f8e94b3392580526; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
 
 fn main() -> bool {
     let balance_test_contract = abi(BalanceTest, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
index 9dcbf8374df..37262272627 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
@@ -6,7 +6,7 @@ use abi_with_tuples::{MyContract, Location, Person};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xfdc14550c8aee742cd556d0ab7f378b7be0d3b1e6e086c097352e94590d4ed02;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x4fc52fadc57b9782e4a0dd8a877fd84ed683f2457a27c2510e01527c1a6d07ec; // AUTO-CONTRACT-ID ../../test_contracts/abi_with_tuples_contract --release
+const CONTRACT_ID = 0xe07390ad6488a20a78c000e8977be0241c240d34389fcf38ec5d1ca784e5b95a; // AUTO-CONTRACT-ID ../../test_contracts/abi_with_tuples_contract --release
 
 fn main() -> bool {
     let the_abi = abi(MyContract, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
index 66d0d0f77df..a91a15e5eb5 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
@@ -4,7 +4,7 @@ use basic_storage_abi::{BasicStorage, Quad};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x94db39f409a31b9f2ebcadeea44378e419208c20de90f5d8e1e33dc1523754cb;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x2b8eb25abb6127c62c10fb80d3a2eee279f1d5f3108524bad6626429ff10d1cc; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
+const CONTRACT_ID = 0x3339428839e3f4bc27336dcb97ecb68979be14105dec0b03018ab355a57e3ec0; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
 
 fn main() -> u64 {
     let addr = abi(BasicStorage, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
index 101d0d92379..8a4940844c9 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
@@ -5,7 +5,7 @@ use contract_with_type_aliases_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x0cbeb6efe3104b460be769bdc4ea101ebf16ccc16f2d7b667ec3e1c7f5ce35b5;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x56f52b5159c54b0530cbb9df293fd808bf56b96fee0a7a323b3fb0129cb60bae; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release
+const CONTRACT_ID = 0x090938439ac2d7e9c9cb023fa7149b16e2cfc90ce1f6a1a406f4bc4732315182; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release
 
 fn main() {
     let caller = abi(MyContract, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
index bda4b3d6208..8799797536d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
@@ -6,7 +6,7 @@ use dynamic_contract_call::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xd1b4047af7ef111c023ab71069e01dc2abfde487c0a0ce1268e4f447e6c6e4c2;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xd2ab897f79d8a2eab9fd541231562ba6eba391a312975b7479b3f5e9af131702; // AUTO-CONTRACT-ID ../../test_contracts/increment_contract --release
+const CONTRACT_ID = 0xbf3482893c3622a429efbd9a990ed57003ce8f9d1914d5150e9c26ee3c815ca5; // AUTO-CONTRACT-ID ../../test_contracts/increment_contract --release
 
 fn main() -> bool {
     let the_abi = abi(Incrementor, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
index 943b34bafcb..b1e97623ce4 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
@@ -5,7 +5,7 @@ use storage_enum_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xc601d11767195485a6654d566c67774134668863d8c797a8c69e8778fb1f89e9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x87cd39b7572475be5271db9a7f1560a01e500825db981c64a74fb9c2a021d241; // AUTO-CONTRACT-ID ../../test_contracts/storage_enum_contract --release
+const CONTRACT_ID = 0x436e6e5ff30566bc2fe4d328400e20d2fe15db17cf496cafb9e1bb977df385c1; // AUTO-CONTRACT-ID ../../test_contracts/storage_enum_contract --release
 
 fn main() -> u64 {
     let caller = abi(StorageEnum, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
index aff2931f411..47be1b5b59d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
@@ -5,7 +5,7 @@ use auth_testing_abi::AuthTesting;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xc2eec20491b53aab7232cbd27c31d15417b4e9daf0b89c74cc242ef1295f681f;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x719f46fab0a55f32fb84b237ab3b777ceb0247bdac5fdd1a3be377e3f6c5a022; // AUTO-CONTRACT-ID ../../test_contracts/auth_testing_contract --release
+const CONTRACT_ID = 0xa85f6137073a24b72b51485cdbb81458672fc0a7b24bc67091757a41e76ef004; // AUTO-CONTRACT-ID ../../test_contracts/auth_testing_contract --release
 
 // should be false in the case of a script
 fn main() -> bool {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
index 0a3676ee83c..53ee2a3a9b1 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
@@ -6,7 +6,7 @@ use context_testing_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x6054c11cda000f5990373a4d61929396165be4dfdd61d5b7bd26da60ab0d8577;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x48b28240a8aca8a9e903fa3a28b835947112e701ba566ce99a97d7df35495965; // AUTO-CONTRACT-ID ../../test_contracts/context_testing_contract --release
+const CONTRACT_ID = 0xa6794dec07cc90143956c4d87480a551ef607e2aa606cca967ea2e8e034f49e1; // AUTO-CONTRACT-ID ../../test_contracts/context_testing_contract --release
 
 fn main() -> bool {
     let gas: u64 = u64::max();
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
index 8e1349c32e2..51b4e66b9a3 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
@@ -5,7 +5,7 @@ use nested_struct_args_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xe63d33a1b3a6903808b379f6a41a72fa8a370e8b76626775e7d9d2f9c4c5da40;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x9a4da0e9d8e7f4b7c9375ff94938df861b99e53c1644a881227ba93272665de6; // AUTO-CONTRACT-ID ../../test_contracts/nested_struct_args_contract --release
+const CONTRACT_ID = 0x4e39077c569e9660c8f1b7eaf0fd36231159502024f683393f3714c5b5ad4d5c; // AUTO-CONTRACT-ID ../../test_contracts/nested_struct_args_contract --release
 
 fn main() -> bool {
     let caller = abi(NestedStructArgs, CONTRACT_ID);
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 30f59986960..57023165547 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
@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x3bc28acd66d327b8c1b9624c1fabfc07e9ffa1b5d71c2832c3bfaaf8f4b805e9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x87e563e3484e325a3e5809b08e034b12000ed7dfda68912105832ad830e0e9a3; // AUTO-CONTRACT-ID ../../test_contracts/storage_access_contract --release
+const CONTRACT_ID = 0x8c9e1ca53b050d1ae2a71e6ebefa0807c5a689940e455253d8dacfa1fc4aaccd; // AUTO-CONTRACT-ID ../../test_contracts/storage_access_contract --release
 
 fn main() -> bool {
     let caller = abi(StorageAccess, CONTRACT_ID);

From 49e42e69a91cfbaccc2e2219b34afcdd0e347952 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 26 Sep 2024 21:07:57 +0530
Subject: [PATCH 15/38] typo bugfix

---
 sway-core/src/asm_generation/fuel/data_section.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sway-core/src/asm_generation/fuel/data_section.rs b/sway-core/src/asm_generation/fuel/data_section.rs
index dbd80c74d0b..f5b926b0919 100644
--- a/sway-core/src/asm_generation/fuel/data_section.rs
+++ b/sway-core/src/asm_generation/fuel/data_section.rs
@@ -273,7 +273,7 @@ impl DataSection {
     fn get(&self, id: &DataId) -> Option<&Entry> {
         match id.kind {
             DataIdEntryKind::NonConfigurable => self.non_configurables.get(id.idx as usize),
-            DataIdEntryKind::Configurable => self.non_configurables.get(id.idx as usize),
+            DataIdEntryKind::Configurable => self.configurables.get(id.idx as usize),
         }
     }
 

From 4c28e6402ecc073ddff1759f2476999a9caee6e7 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Mon, 30 Sep 2024 16:28:16 +0530
Subject: [PATCH 16/38] change how we handle loading of non-copy types so that
 data_section is unmodified

---
 sway-core/src/asm_generation/finalized_asm.rs | 23 +++++++++++++
 .../src/asm_generation/fuel/data_section.rs   | 14 ++++++--
 sway-core/src/asm_lang/allocated_ops.rs       | 11 ++++---
 .../json_abi_oracle_new_encoding.json         | 32 +++++++++----------
 4 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/sway-core/src/asm_generation/finalized_asm.rs b/sway-core/src/asm_generation/finalized_asm.rs
index 7a5f883e6c0..02f914bc6f8 100644
--- a/sway-core/src/asm_generation/finalized_asm.rs
+++ b/sway-core/src/asm_generation/finalized_asm.rs
@@ -130,6 +130,29 @@ fn to_bytecode_mut(
         .iter()
         .fold(0, |acc, item| acc + op_size_in_bytes(data_section, item));
 
+    let mut offset_from_instr_start = 0;
+    for op in ops.iter() {
+        match &op.opcode {
+            AllocatedOpcode::LoadDataId(_reg, data_label)
+                if !data_section
+                    .has_copy_type(data_label)
+                    .expect("data label references non existent data -- internal error") =>
+            {
+                // For non-copy type loads, pre-insert pointers into the data_section so that
+                // from this point on, the data_section remains immutable. This is necessary
+                // so that when we take addresses of configurables, that address doesn't change
+                // later on if a non-configurable is added to the data-section.
+                let offset_bytes = data_section.data_id_to_offset(data_label) as u64;
+                // The -4 is because $pc is added in the *next* instruction.
+                let pointer_offset_from_current_instr =
+                    offset_to_data_section_in_bytes - offset_from_instr_start + offset_bytes - 4;
+                data_section.append_pointer(pointer_offset_from_current_instr);
+            }
+            _ => ()
+        }
+        offset_from_instr_start += op_size_in_bytes(data_section, op);
+    }
+
     // A noop is inserted in ASM generation if required, to word-align the data section.
     let mut ops_padded = Vec::new();
     let ops = if offset_to_data_section_in_bytes & 7 == 0 {
diff --git a/sway-core/src/asm_generation/fuel/data_section.rs b/sway-core/src/asm_generation/fuel/data_section.rs
index f5b926b0919..b272eef3505 100644
--- a/sway-core/src/asm_generation/fuel/data_section.rs
+++ b/sway-core/src/asm_generation/fuel/data_section.rs
@@ -1,3 +1,4 @@
+use rustc_hash::FxHashMap;
 use sway_ir::{size_bytes_round_up_to_word_alignment, Constant, ConstantValue, Context, Padding};
 
 use std::{fmt, iter::repeat};
@@ -245,6 +246,7 @@ impl fmt::Display for DataId {
 pub struct DataSection {
     pub non_configurables: Vec<Entry>,
     pub configurables: Vec<Entry>,
+    pub(crate) pointer_id: FxHashMap<u64, DataId>,
 }
 
 impl DataSection {
@@ -324,11 +326,19 @@ impl DataSection {
     /// relative to the current (load) instruction.
     pub(crate) fn append_pointer(&mut self, pointer_value: u64) -> DataId {
         // The 'pointer' is just a literal 64 bit address.
-        self.insert_data_value(Entry::new_word(
+        let data_id = self.insert_data_value(Entry::new_word(
             pointer_value,
             EntryName::NonConfigurable,
             None,
-        ))
+        ));
+        self.pointer_id.insert(pointer_value, data_id.clone());
+        data_id
+    }
+
+    /// Get the [DataId] for a pointer, if it exists.
+    /// The pointer must've been inserted with append_pointer.
+    pub(crate) fn data_id_of_pointer(&self, pointer_value: u64) -> Option<DataId> {
+        self.pointer_id.get(&pointer_value).cloned()
     }
 
     /// Given any data in the form of a [Literal] (using this type mainly because it includes type
diff --git a/sway-core/src/asm_lang/allocated_ops.rs b/sway-core/src/asm_lang/allocated_ops.rs
index 72ad640cfc0..6d147deab33 100644
--- a/sway-core/src/asm_lang/allocated_ops.rs
+++ b/sway-core/src/asm_lang/allocated_ops.rs
@@ -571,7 +571,7 @@ impl AllocatedOp {
         &self,
         offset_to_data_section: u64,
         offset_from_instr_start: u64,
-        data_section: &mut DataSection,
+        data_section: &DataSection,
     ) -> FuelAsmData {
         use AllocatedOpcode::*;
         FuelAsmData::Instructions(vec![match &self.opcode {
@@ -763,9 +763,10 @@ impl AllocatedOp {
 fn addr_of(
     dest: &AllocatedRegister,
     data_id: &DataId,
-    data_section: &mut DataSection,
+    data_section: &DataSection,
 ) -> Vec<fuel_asm::Instruction> {
     let offset_bytes = data_section.data_id_to_offset(data_id) as u64;
+    dbg!(data_id, offset_bytes);
     vec![fuel_asm::Instruction::ADDI(ADDI::new(
         dest.to_reg_id(),
         fuel_asm::RegId::new(DATA_SECTION_REGISTER),
@@ -780,7 +781,7 @@ fn addr_of(
 fn realize_load(
     dest: &AllocatedRegister,
     data_id: &DataId,
-    data_section: &mut DataSection,
+    data_section: &DataSection,
     offset_to_data_section: u64,
     offset_from_instr_start: u64,
 ) -> Vec<fuel_asm::Instruction> {
@@ -823,7 +824,9 @@ fn realize_load(
             offset_to_data_section - offset_from_instr_start + offset_bytes - 4;
 
         // insert the pointer as bytes as a new data section entry at the end of the data
-        let data_id_for_pointer = data_section.append_pointer(pointer_offset_from_current_instr);
+        let data_id_for_pointer = data_section
+            .data_id_of_pointer(pointer_offset_from_current_instr)
+            .expect("Pointer offset must be in data_section");
 
         // now load the pointer we just created into the `dest`ination
         let mut buf = Vec::with_capacity(2);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
index d6ed0baf448..a6b51aee5f2 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
@@ -62,82 +62,82 @@
     {
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
       "name": "BOOL",
-      "offset": 7240
+      "offset": 7392
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "U8",
-      "offset": 7432
+      "offset": 7584
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "ANOTHER_U8",
-      "offset": 7168
+      "offset": 7320
     },
     {
       "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
       "name": "U16",
-      "offset": 7376
+      "offset": 7528
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
       "name": "U32",
-      "offset": 7416
+      "offset": 7568
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
       "name": "U64",
-      "offset": 7424
+      "offset": 7576
     },
     {
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
       "name": "U256",
-      "offset": 7384
+      "offset": 7536
     },
     {
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
       "name": "B256",
-      "offset": 7208
+      "offset": 7360
     },
     {
       "concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff",
       "name": "CONFIGURABLE_STRUCT",
-      "offset": 7328
+      "offset": 7480
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
       "name": "CONFIGURABLE_ENUM_A",
-      "offset": 7248
+      "offset": 7400
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
       "name": "CONFIGURABLE_ENUM_B",
-      "offset": 7288
+      "offset": 7440
     },
     {
       "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6",
       "name": "ARRAY_BOOL",
-      "offset": 7176
+      "offset": 7328
     },
     {
       "concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199",
       "name": "ARRAY_U64",
-      "offset": 7184
+      "offset": 7336
     },
     {
       "concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be",
       "name": "TUPLE_BOOL_U64",
-      "offset": 7360
+      "offset": 7512
     },
     {
       "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
       "name": "STR_4",
-      "offset": 7352
+      "offset": 7504
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "NOT_USED",
-      "offset": 7344
+      "offset": 7496
     }
   ],
   "encodingVersion": "1",

From 075e699c00de60a55c6a7607b91e68ce352ea887 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Mon, 30 Sep 2024 16:31:29 +0530
Subject: [PATCH 17/38] cargo fmt

---
 sway-core/src/asm_generation/finalized_asm.rs         | 2 +-
 sway-core/src/asm_generation/fuel/fuel_asm_builder.rs | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sway-core/src/asm_generation/finalized_asm.rs b/sway-core/src/asm_generation/finalized_asm.rs
index 02f914bc6f8..4ce875173f2 100644
--- a/sway-core/src/asm_generation/finalized_asm.rs
+++ b/sway-core/src/asm_generation/finalized_asm.rs
@@ -148,7 +148,7 @@ fn to_bytecode_mut(
                     offset_to_data_section_in_bytes - offset_from_instr_start + offset_bytes - 4;
                 data_section.append_pointer(pointer_offset_from_current_instr);
             }
-            _ => ()
+            _ => (),
         }
         offset_from_instr_start += op_size_in_bytes(data_section, op);
     }
diff --git a/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs b/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs
index 8761d535267..a011b8ee0c4 100644
--- a/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs
+++ b/sway-core/src/asm_generation/fuel/fuel_asm_builder.rs
@@ -2190,9 +2190,11 @@ impl<'ir, 'eng> FuelAsmBuilder<'ir, 'eng> {
             }
         } else {
             let comment = comment.into();
-            let data_id = self
-                .data_section
-                .insert_data_value(Entry::new_word(imm, EntryName::NonConfigurable, None));
+            let data_id = self.data_section.insert_data_value(Entry::new_word(
+                imm,
+                EntryName::NonConfigurable,
+                None,
+            ));
             self.cur_bytecode.push(Op {
                 opcode: Either::Left(VirtualOp::LoadDataId(reg.clone(), data_id)),
                 owning_span: span.clone(),

From cc9b8a3d27946e2ddc65f727c6fef717d787d736 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Tue, 1 Oct 2024 14:34:24 +0530
Subject: [PATCH 18/38] Add padding for bytecode word alignment before
 finalising data-section

---
 sway-core/src/asm_generation/finalized_asm.rs | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/sway-core/src/asm_generation/finalized_asm.rs b/sway-core/src/asm_generation/finalized_asm.rs
index 4ce875173f2..46a03fb3e67 100644
--- a/sway-core/src/asm_generation/finalized_asm.rs
+++ b/sway-core/src/asm_generation/finalized_asm.rs
@@ -130,6 +130,22 @@ fn to_bytecode_mut(
         .iter()
         .fold(0, |acc, item| acc + op_size_in_bytes(data_section, item));
 
+    // A noop is inserted in ASM generation if required, to word-align the data section.
+    let mut ops_padded = Vec::new();
+    let ops = if offset_to_data_section_in_bytes & 7 == 0 {
+        ops
+    } else {
+        ops_padded.reserve(ops.len() + 1);
+        ops_padded.extend(ops.iter().cloned());
+        ops_padded.push(AllocatedOp {
+            opcode: AllocatedOpcode::NOOP,
+            comment: "word-alignment of data section".into(),
+            owning_span: None,
+        });
+        offset_to_data_section_in_bytes += 4;
+        &ops_padded
+    };
+
     let mut offset_from_instr_start = 0;
     for op in ops.iter() {
         match &op.opcode {
@@ -153,22 +169,6 @@ fn to_bytecode_mut(
         offset_from_instr_start += op_size_in_bytes(data_section, op);
     }
 
-    // A noop is inserted in ASM generation if required, to word-align the data section.
-    let mut ops_padded = Vec::new();
-    let ops = if offset_to_data_section_in_bytes & 7 == 0 {
-        ops
-    } else {
-        ops_padded.reserve(ops.len() + 1);
-        ops_padded.extend(ops.iter().cloned());
-        ops_padded.push(AllocatedOp {
-            opcode: AllocatedOpcode::NOOP,
-            comment: "word-alignment of data section".into(),
-            owning_span: None,
-        });
-        offset_to_data_section_in_bytes += 4;
-        &ops_padded
-    };
-
     let mut bytecode = Vec::with_capacity(offset_to_data_section_in_bytes as usize);
 
     if build_config.print_bytecode {

From aeaf12c39809ef324946d296b48a311bbfd6e51e Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Tue, 1 Oct 2024 14:36:24 +0530
Subject: [PATCH 19/38] update tests

---
 .../array_of_structs_caller/src/main.sw                         | 2 +-
 .../require_contract_deployment/asset_ops_test/src/main.sw      | 2 +-
 .../require_contract_deployment/bal_opcode/src/main.sw          | 2 +-
 .../call_abi_with_tuples/src/main.sw                            | 2 +-
 .../require_contract_deployment/call_basic_storage/src/main.sw  | 2 +-
 .../call_contract_with_type_aliases/src/main.sw                 | 2 +-
 .../call_increment_contract/src/main.sw                         | 2 +-
 .../require_contract_deployment/call_storage_enum/src/main.sw   | 2 +-
 .../require_contract_deployment/caller_auth_test/src/main.sw    | 2 +-
 .../require_contract_deployment/caller_context_test/src/main.sw | 2 +-
 .../nested_struct_args_caller/src/main.sw                       | 2 +-
 .../storage_access_caller/src/main.sw                           | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
index 575ca323135..a7ae9027c59 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x14ed3cd06c2947248f69d54bfa681fe40d26267be84df7e19e253622b7921bbe;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xbbda20fb25bdb4b18451501418b06324376c61cb984e75fcbc983fc0a047f85b; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release
+const CONTRACT_ID = 0xa297e99c5a9bfe19a6bd001b5c32ee9af3c322a632be8f0089ce5fe9c95108b6; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release
 
 fn get_address() -> Option<std::address::Address> {
     Some(CONTRACT_ID.into())
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
index 62d1ae4abba..8031f4ee39c 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
@@ -14,7 +14,7 @@ const FUEL_COIN_CONTRACT_ID = 0x0c4cde0b9ae10f8949845fcfd2d0e10fcd172751ff4c2cb8
 #[cfg(experimental_new_encoding = false)]
 const BALANCE_CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;
 #[cfg(experimental_new_encoding = true)]
-const BALANCE_CONTRACT_ID = 0xebe7a84ed5198e9d7d3e002a571058dc24d56f61f2526ca30328f519528f98eb; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
+const BALANCE_CONTRACT_ID = 0x0a2a2f1751c2a23575cf5fb050d144e786d5b018fd34bf594c6bfdbff8afd795; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
 
 fn main() -> bool {
     let default_gas = 1_000_000_000_000;
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
index 3afdbe1afc2..93ef8310ab4 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
@@ -5,7 +5,7 @@ use balance_test_abi::BalanceTest;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xebe7a84ed5198e9d7d3e002a571058dc24d56f61f2526ca30328f519528f98eb; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
+const CONTRACT_ID = 0x0a2a2f1751c2a23575cf5fb050d144e786d5b018fd34bf594c6bfdbff8afd795; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
 
 fn main() -> bool {
     let balance_test_contract = abi(BalanceTest, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
index 49d7c83bf80..7cbfdd990d9 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
@@ -6,7 +6,7 @@ use abi_with_tuples::{MyContract, Location, Person};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xfdc14550c8aee742cd556d0ab7f378b7be0d3b1e6e086c097352e94590d4ed02;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x95bff8249257356f042d500e9f7db1a964ab5739a1b156eafaca3c7a4efc8aaa; // AUTO-CONTRACT-ID ../../test_contracts/abi_with_tuples_contract --release
+const CONTRACT_ID = 0xa701688d0a5903e4b065cdaff94a166fda0eca0128bfd1e1105236186a268aee; // AUTO-CONTRACT-ID ../../test_contracts/abi_with_tuples_contract --release
 
 fn main() -> bool {
     let the_abi = abi(MyContract, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
index b1166cfb9fb..c0c071f9aa3 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
@@ -4,7 +4,7 @@ use basic_storage_abi::{BasicStorage, Quad};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x94db39f409a31b9f2ebcadeea44378e419208c20de90f5d8e1e33dc1523754cb;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xd8e3576d2f7b2ed2d5f8935aef4837e6ff32b1c092d8ae369ad0fdd955a52169; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
+const CONTRACT_ID = 0x3a8f4a130573a7040a9e714b0c8a14e47e5eab95ae660e6fa5093b8ee17cffff; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
 
 fn main() -> u64 {
     let addr = abi(BasicStorage, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
index bc2f5881cd6..9f049140617 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
@@ -5,7 +5,7 @@ use contract_with_type_aliases_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x0cbeb6efe3104b460be769bdc4ea101ebf16ccc16f2d7b667ec3e1c7f5ce35b5;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x514dae6ddad19623646033458f970d1286ef111806145daf80d06ca679604a96; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release
+const CONTRACT_ID = 0xf4cc66190a144f6dd4c63c5507717919c467c62bdcd87ff29d2bf5c3cb9f7a87; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release
 
 fn main() {
     let caller = abi(MyContract, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
index f518c022f5b..7fe8b34f24d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
@@ -6,7 +6,7 @@ use dynamic_contract_call::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xd1b4047af7ef111c023ab71069e01dc2abfde487c0a0ce1268e4f447e6c6e4c2;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xc906accda9e1e516ee3122770217d913edca1ae6e3b8bad15c2c1a53ebf5e13e; // AUTO-CONTRACT-ID ../../test_contracts/increment_contract --release
+const CONTRACT_ID = 0x7741739041b88739c1abb156d4b63e4ba564b044883a81f682d2c22a31113a16; // AUTO-CONTRACT-ID ../../test_contracts/increment_contract --release
 
 fn main() -> bool {
     let the_abi = abi(Incrementor, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
index c3e736cb17f..76deab07d0e 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
@@ -5,7 +5,7 @@ use storage_enum_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xc601d11767195485a6654d566c67774134668863d8c797a8c69e8778fb1f89e9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xaa4e990e0796764624423b63c1bb14fdc02918294fab87682c1ee768de745a7e; // AUTO-CONTRACT-ID ../../test_contracts/storage_enum_contract --release
+const CONTRACT_ID = 0xcd0c5b696dd0d7f1e673f692260fb6cb2076cc745b6f5afb386462c4a2831528; // AUTO-CONTRACT-ID ../../test_contracts/storage_enum_contract --release
 
 fn main() -> u64 {
     let caller = abi(StorageEnum, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
index 931e9f010df..c72489bf0d0 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
@@ -5,7 +5,7 @@ use auth_testing_abi::AuthTesting;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xc2eec20491b53aab7232cbd27c31d15417b4e9daf0b89c74cc242ef1295f681f;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x57892f3d8bd8c58137b35d177a8c03121193d51138ad2218e814af505e90a7f2; // AUTO-CONTRACT-ID ../../test_contracts/auth_testing_contract --release
+const CONTRACT_ID = 0x95387ebd6b972ea36bdbf1468c1d6b24c7e3c9ae220c3a63b3a519d22087691d; // AUTO-CONTRACT-ID ../../test_contracts/auth_testing_contract --release
 
 // should be false in the case of a script
 fn main() -> bool {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
index 0f6ed8007b6..ac2ba8b6880 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
@@ -6,7 +6,7 @@ use context_testing_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x6054c11cda000f5990373a4d61929396165be4dfdd61d5b7bd26da60ab0d8577;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x6c159e40368c6a37b8c479cd63f5462832d5dbdc8d872c4b30edc38e230b7e51; // AUTO-CONTRACT-ID ../../test_contracts/context_testing_contract --release
+const CONTRACT_ID = 0x0904175568c7baaa3be0fc60d85aa072dfb0aed3667a7879f47e8d77bbcbcb18; // AUTO-CONTRACT-ID ../../test_contracts/context_testing_contract --release
 
 fn main() -> bool {
     let gas: u64 = u64::max();
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
index 8410b0175e8..8f245299a1d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
@@ -5,7 +5,7 @@ use nested_struct_args_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xe63d33a1b3a6903808b379f6a41a72fa8a370e8b76626775e7d9d2f9c4c5da40;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xc26e4f54f9bca811be460d07aaedfa12d46477378573947ae95653affba962be; // AUTO-CONTRACT-ID ../../test_contracts/nested_struct_args_contract --release
+const CONTRACT_ID = 0x287d5a3cad5833647ca3c48816dd4c1a3c429b55b0d1d0a8ba07065d62e78507; // AUTO-CONTRACT-ID ../../test_contracts/nested_struct_args_contract --release
 
 fn main() -> bool {
     let caller = abi(NestedStructArgs, CONTRACT_ID);
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 13dd55fec91..168a9e679da 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
@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x3bc28acd66d327b8c1b9624c1fabfc07e9ffa1b5d71c2832c3bfaaf8f4b805e9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x83ec366b3623ee28ec09d3d92dcc2e113cc7427adb194fb42608103b0188fb83; // AUTO-CONTRACT-ID ../../test_contracts/storage_access_contract --release
+const CONTRACT_ID = 0x713ff7f9993309f17ee90d0f63fdf754265daa6028947ab842faf676c79e625e; // AUTO-CONTRACT-ID ../../test_contracts/storage_access_contract --release
 
 fn main() -> bool {
     let caller = abi(StorageAccess, CONTRACT_ID);

From ddea0013de0f987ee3a74d40820c858e9edb9cde Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Tue, 1 Oct 2024 14:40:30 +0530
Subject: [PATCH 20/38] update configurable_consts json

---
 .../json_abi_oracle_new_encoding.json         | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
index b5e886d1a19..fb14cd4d3c7 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
@@ -62,82 +62,82 @@
     {
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
       "name": "BOOL",
-      "offset": 7216
+      "offset": 7400
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "U8",
-      "offset": 7408
+      "offset": 7592
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "ANOTHER_U8",
-      "offset": 7144
+      "offset": 7328
     },
     {
       "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
       "name": "U16",
-      "offset": 7352
+      "offset": 7536
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
       "name": "U32",
-      "offset": 7392
+      "offset": 7576
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
       "name": "U64",
-      "offset": 7400
+      "offset": 7584
     },
     {
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
       "name": "U256",
-      "offset": 7360
+      "offset": 7544
     },
     {
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
       "name": "B256",
-      "offset": 7184
+      "offset": 7368
     },
     {
       "concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff",
       "name": "CONFIGURABLE_STRUCT",
-      "offset": 7304
+      "offset": 7488
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
       "name": "CONFIGURABLE_ENUM_A",
-      "offset": 7224
+      "offset": 7408
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
       "name": "CONFIGURABLE_ENUM_B",
-      "offset": 7264
+      "offset": 7448
     },
     {
       "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6",
       "name": "ARRAY_BOOL",
-      "offset": 7152
+      "offset": 7336
     },
     {
       "concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199",
       "name": "ARRAY_U64",
-      "offset": 7160
+      "offset": 7344
     },
     {
       "concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be",
       "name": "TUPLE_BOOL_U64",
-      "offset": 7336
+      "offset": 7520
     },
     {
       "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
       "name": "STR_4",
-      "offset": 7328
+      "offset": 7512
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "NOT_USED",
-      "offset": 7320
+      "offset": 7504
     }
   ],
   "encodingVersion": "1",

From f923af0b14a6af50dfde6129a7853ed5e091d938 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 2 Oct 2024 11:44:40 +0530
Subject: [PATCH 21/38] some fixes

---
 forc/src/cli/commands/parse_bytecode.rs           | 2 +-
 sway-core/src/asm_generation/fuel/data_section.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/forc/src/cli/commands/parse_bytecode.rs b/forc/src/cli/commands/parse_bytecode.rs
index a025520b085..2844f1216f4 100644
--- a/forc/src/cli/commands/parse_bytecode.rs
+++ b/forc/src/cli/commands/parse_bytecode.rs
@@ -59,7 +59,7 @@ pub(crate) fn exec(command: Command) -> ForcResult<()> {
                     parsed_raw
                 )
             }
-            Err(fuel_asm::InvalidOpcode) if word_ix >= 4 && word_ix < 12 => {
+            Err(fuel_asm::InvalidOpcode) if (4..12).contains(&word_ix) => {
                 let parsed_raw = u32::from_be_bytes([raw[0], raw[1], raw[2], raw[3]]);
                 format!("Metadata[{}] ({})", word_ix - 4, parsed_raw)
             }
diff --git a/sway-core/src/asm_generation/fuel/data_section.rs b/sway-core/src/asm_generation/fuel/data_section.rs
index b272eef3505..e442dcf5ac1 100644
--- a/sway-core/src/asm_generation/fuel/data_section.rs
+++ b/sway-core/src/asm_generation/fuel/data_section.rs
@@ -409,9 +409,9 @@ impl fmt::Display for DataSection {
         for (ix, entry) in self.iter_all_entries().enumerate() {
             writeln!(
                 data_buf,
-                "{}: {} {}",
-                ix,
+                "data_{}_{} {}",
                 entry.name,
+                ix,
                 display_entry(&entry.value)
             )?;
         }

From 5cae76d9206f6b38ebc89a5dba0e1a4a1e136d6d Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 2 Oct 2024 16:16:03 +0530
Subject: [PATCH 22/38] more fixes

---
 forc-pkg/src/pkg.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
index 3f4327ec188..375653433db 100644
--- a/forc-pkg/src/pkg.rs
+++ b/forc-pkg/src/pkg.rs
@@ -1958,7 +1958,10 @@ pub fn compile(
         }
     }
 
-    set_bytecode_metadata(&mut compiled, &md);
+    // We know to set the metadata only for fuelvm right now.
+    if let BuildTarget::Fuel = pkg.target {
+        set_bytecode_metadata(&mut compiled, &md);
+    }
 
     metrics.bytecode_size = compiled.bytecode.len();
     let bytecode = BuiltPackageBytecode {

From 7cc793c5cdff81182c39532b21bec19713d8f280 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 2 Oct 2024 16:51:38 +0530
Subject: [PATCH 23/38] more test updates

---
 forc-plugins/forc-client/tests/deploy.rs       | 8 ++++----
 test/src/sdk-harness/test_projects/auth/mod.rs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs
index eb3c8e259a8..59548308e84 100644
--- a/forc-plugins/forc-client/tests/deploy.rs
+++ b/forc-plugins/forc-client/tests/deploy.rs
@@ -341,7 +341,7 @@ async fn test_simple_deploy() {
     node.kill().unwrap();
     let expected = vec![DeployedContract {
         id: ContractId::from_str(
-            "4ea5fa100cd7c8972bc8925ed6f8ccfb6bf1e16f79c3642c3a503c73b7d18de2",
+            "b3847d2665c67501709de2cb64ed92f5481d26949f27d36a01580196a22c180e",
         )
         .unwrap(),
         proxy: None,
@@ -383,7 +383,7 @@ async fn test_deploy_submit_only() {
     node.kill().unwrap();
     let expected = vec![DeployedContract {
         id: ContractId::from_str(
-            "4ea5fa100cd7c8972bc8925ed6f8ccfb6bf1e16f79c3642c3a503c73b7d18de2",
+            "b3847d2665c67501709de2cb64ed92f5481d26949f27d36a01580196a22c180e",
         )
         .unwrap(),
         proxy: None,
@@ -428,12 +428,12 @@ async fn test_deploy_fresh_proxy() {
     node.kill().unwrap();
     let impl_contract = DeployedContract {
         id: ContractId::from_str(
-            "4ea5fa100cd7c8972bc8925ed6f8ccfb6bf1e16f79c3642c3a503c73b7d18de2",
+            "b3847d2665c67501709de2cb64ed92f5481d26949f27d36a01580196a22c180e",
         )
         .unwrap(),
         proxy: Some(
             ContractId::from_str(
-                "deb633128bceadcd4eb4fe546089f6653727348b60228638a7f9d55d0b6da1ae",
+                "fec7972fcf5ab7f9eff1facda3584c464c1eaed157115651b3a0795461691141",
             )
             .unwrap(),
         ),
diff --git a/test/src/sdk-harness/test_projects/auth/mod.rs b/test/src/sdk-harness/test_projects/auth/mod.rs
index 2fefd28f8c8..a24dda546ab 100644
--- a/test/src/sdk-harness/test_projects/auth/mod.rs
+++ b/test/src/sdk-harness/test_projects/auth/mod.rs
@@ -624,7 +624,7 @@ async fn can_get_predicate_address() {
 
     // Setup predicate.
     let hex_predicate_address: &str =
-        "0x5dcc82a88eebb07fb628db93d11ec38f085cbf36453a7135fea41b93cc44e118";
+        "0x8ec63b2b9885e49585f1e0d1e9fde8173412c27018508c693ae7fdce8585812d";
     let predicate_address =
         Address::from_str(hex_predicate_address).expect("failed to create Address from string");
     let predicate_bech32_address = Bech32Address::from(predicate_address);
@@ -750,7 +750,7 @@ async fn when_incorrect_predicate_address_passed() {
 async fn can_get_predicate_address_in_message() {
     // Setup predicate address.
     let hex_predicate_address: &str =
-        "0x5dcc82a88eebb07fb628db93d11ec38f085cbf36453a7135fea41b93cc44e118";
+        "0x8ec63b2b9885e49585f1e0d1e9fde8173412c27018508c693ae7fdce8585812d";
     let predicate_address =
         Address::from_str(hex_predicate_address).expect("failed to create Address from string");
     let predicate_bech32_address = Bech32Address::from(predicate_address);

From 2dd7601126c006b16f7732662d4762b1ff11ab2b Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 3 Oct 2024 06:53:59 +0530
Subject: [PATCH 24/38] more test fixes

---
 .../language/u256/u256_abi/json_abi_oracle_new_encoding.json    | 2 +-
 .../require_contract_deployment/asset_ops_test/src/main.sw      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
index 5b834c3566e..739e4852d66 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
@@ -9,7 +9,7 @@
     {
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
       "name": "SOME_U256",
-      "offset": 808
+      "offset": 888
     }
   ],
   "encodingVersion": "1",
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
index 8031f4ee39c..219a600c254 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
@@ -9,7 +9,7 @@ use test_fuel_coin_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const FUEL_COIN_CONTRACT_ID = 0xec2277ebe007ade87e3d797c3b1e070dcd542d5ef8f038b471f262ef9cebc87c;
 #[cfg(experimental_new_encoding = true)]
-const FUEL_COIN_CONTRACT_ID = 0x0c4cde0b9ae10f8949845fcfd2d0e10fcd172751ff4c2cb8ea54ad87542af49b;
+const FUEL_COIN_CONTRACT_ID = 0x4fd649815ef56746fa57d1d4a5667962d780af225a58d3a0409d41bc72806a9f;
 
 #[cfg(experimental_new_encoding = false)]
 const BALANCE_CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;

From 52c06eba59083fc80abd7913b52e7f39ba2965dc Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 3 Oct 2024 07:26:56 +0530
Subject: [PATCH 25/38] update predicate root for test

---
 test/src/sdk-harness/test_projects/auth/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/src/sdk-harness/test_projects/auth/mod.rs b/test/src/sdk-harness/test_projects/auth/mod.rs
index a24dda546ab..9b34e42b02a 100644
--- a/test/src/sdk-harness/test_projects/auth/mod.rs
+++ b/test/src/sdk-harness/test_projects/auth/mod.rs
@@ -624,7 +624,7 @@ async fn can_get_predicate_address() {
 
     // Setup predicate.
     let hex_predicate_address: &str =
-        "0x8ec63b2b9885e49585f1e0d1e9fde8173412c27018508c693ae7fdce8585812d";
+        "0x7f1402b869d09809aa52814b0b7effd4db1dc9f56345cd8878f979c8df78803f";
     let predicate_address =
         Address::from_str(hex_predicate_address).expect("failed to create Address from string");
     let predicate_bech32_address = Bech32Address::from(predicate_address);
@@ -750,7 +750,7 @@ async fn when_incorrect_predicate_address_passed() {
 async fn can_get_predicate_address_in_message() {
     // Setup predicate address.
     let hex_predicate_address: &str =
-        "0x8ec63b2b9885e49585f1e0d1e9fde8173412c27018508c693ae7fdce8585812d";
+        "0x7f1402b869d09809aa52814b0b7effd4db1dc9f56345cd8878f979c8df78803f";
     let predicate_address =
         Address::from_str(hex_predicate_address).expect("failed to create Address from string");
     let predicate_bech32_address = Bech32Address::from(predicate_address);

From d99bc98baad5a7efc46d4713019cc7cfec0b3a64 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 3 Oct 2024 11:25:57 +0530
Subject: [PATCH 26/38] update forc test

---
 forc/tests/cli_integration.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forc/tests/cli_integration.rs b/forc/tests/cli_integration.rs
index 407cda7489d..0671c875626 100644
--- a/forc/tests/cli_integration.rs
+++ b/forc/tests/cli_integration.rs
@@ -49,10 +49,10 @@ fn test_forc_test_raw_logs() -> Result<(), rexpect::error::Error> {
     // Assert that the output is correct
     process.exp_string("      test test_log_4")?;
     process.exp_string("Raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12652,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12684,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
     process.exp_string("      test test_log_2")?;
     process.exp_string("Raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12652,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12684,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
 
     process.process.exit()?;
     Ok(())
@@ -74,11 +74,11 @@ fn test_forc_test_both_logs() -> Result<(), rexpect::error::Error> {
     process.exp_string("      test test_log_4")?;
     process.exp_string("Decoded log value: 4, log rb: 1515152261580153489")?;
     process.exp_string("Raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12652,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12684,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
     process.exp_string("      test test_log_2")?;
     process.exp_string("Decoded log value: 2, log rb: 1515152261580153489")?;
     process.exp_string("Raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12652,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12684,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
     process.process.exit()?;
     Ok(())
 }

From c029db387bb39e1b5bae420d23ea05468d9f0a62 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 9 Oct 2024 14:52:38 +0530
Subject: [PATCH 27/38] review comments

---
 forc-test/src/execute.rs                | 2 +-
 sway-core/src/asm_lang/allocated_ops.rs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/forc-test/src/execute.rs b/forc-test/src/execute.rs
index 0fed0d96007..467c9b3e7fc 100644
--- a/forc-test/src/execute.rs
+++ b/forc-test/src/execute.rs
@@ -246,7 +246,7 @@ impl TestExecutor {
 /// The following is how the beginning of the bytecode is laid out:
 ///
 /// ```ignore
-/// [ 0] ji   i4                       ; Jumps to the data section setup.
+/// [ 0] ji   i(4 + 8)                 ; Jumps to the data section setup.
 /// [ 1] noop
 /// [ 2] DATA_SECTION_OFFSET[0..32]
 /// [ 3] DATA_SECTION_OFFSET[32..64]
diff --git a/sway-core/src/asm_lang/allocated_ops.rs b/sway-core/src/asm_lang/allocated_ops.rs
index 6d147deab33..3c08704545c 100644
--- a/sway-core/src/asm_lang/allocated_ops.rs
+++ b/sway-core/src/asm_lang/allocated_ops.rs
@@ -766,7 +766,6 @@ fn addr_of(
     data_section: &DataSection,
 ) -> Vec<fuel_asm::Instruction> {
     let offset_bytes = data_section.data_id_to_offset(data_id) as u64;
-    dbg!(data_id, offset_bytes);
     vec![fuel_asm::Instruction::ADDI(ADDI::new(
         dest.to_reg_id(),
         fuel_asm::RegId::new(DATA_SECTION_REGISTER),

From 1c8764145a505a45c765b096797706b8794cb575 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 9 Oct 2024 21:29:00 +0530
Subject: [PATCH 28/38] update test

---
 .../deployed_script-loader-abi.json           | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json b/forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json
index 81b65c43cd7..c51c80ae2e9 100644
--- a/forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json
+++ b/forc-plugins/forc-client/test/data/deployed_script/deployed_script-loader-abi.json
@@ -251,62 +251,62 @@
     {
       "name": "BOOL",
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
-      "offset": 136
+      "offset": 240
     },
     {
       "name": "U8",
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
-      "offset": 248
+      "offset": 352
     },
     {
       "name": "U16",
       "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
-      "offset": 192
+      "offset": 296
     },
     {
       "name": "U32",
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
-      "offset": 232
+      "offset": 336
     },
     {
       "name": "U64",
       "concreteTypeId": "1506e6f44c1d6291cdf46395a8e573276a4fa79e8ace3fc891e092ef32d1b0a0",
-      "offset": 240
+      "offset": 344
     },
     {
       "name": "U256",
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
-      "offset": 200
+      "offset": 304
     },
     {
       "name": "B256",
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
-      "offset": 104
+      "offset": 208
     },
     {
       "name": "STR_4",
       "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
-      "offset": 176
+      "offset": 280
     },
     {
       "name": "TUPLE",
       "concreteTypeId": "e0128f7be9902d1fe16326cafe703b52038064a7997b03ebfc1c9dd607e1536c",
-      "offset": 184
+      "offset": 288
     },
     {
       "name": "ARRAY",
       "concreteTypeId": "d9fac01ab38fe10950758ae9604da330d6406a71fda3ef1ea818121261132d56",
-      "offset": 88
+      "offset": 192
     },
     {
       "name": "STRUCT",
       "concreteTypeId": "563310524b4f4447a10d0e50556310253dfb3b5eb4b29c3773222b737c8b7075",
-      "offset": 160
+      "offset": 264
     },
     {
       "name": "ENUM",
       "concreteTypeId": "37cd1cba311039a851ac8bfa614cc41359b4ad95c8656fcef2e8f504fe7a1272",
-      "offset": 144
+      "offset": 248
     }
   ]
 }
\ No newline at end of file

From f6444017391d6d7d8f9ed8ff41b8e8e56ef8666b Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 23 Oct 2024 11:32:09 +0530
Subject: [PATCH 29/38] Change Metadata to Configurables offset. 256b -> 64b

---
 forc-pkg/src/pkg.rs                           | 12 ++--------
 forc-test/src/execute.rs                      | 14 ++++--------
 sway-core/src/asm_generation/finalized_asm.rs | 10 ++++-----
 .../allocated_abstract_instruction_set.rs     |  6 ++---
 .../asm_generation/fuel/programs/abstract.rs  | 22 +++++++------------
 sway-core/src/asm_lang/allocated_ops.rs       | 15 +++++--------
 sway-core/src/asm_lang/mod.rs                 | 22 ++++++++-----------
 sway-core/src/asm_lang/virtual_ops.rs         |  2 +-
 sway-core/src/lib.rs                          |  4 ++--
 9 files changed, 40 insertions(+), 67 deletions(-)

diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
index 375653433db..bf909967d82 100644
--- a/forc-pkg/src/pkg.rs
+++ b/forc-pkg/src/pkg.rs
@@ -1924,10 +1924,7 @@ pub fn compile(
     print_warnings(engines.se(), terse_mode, &pkg.name, &warnings, &tree_type);
 
     // Metadata to be placed into the binary.
-    let mut md = [
-        0u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0,
-    ];
+    let mut md = [0u8, 0, 0, 0, 0, 0, 0, 0];
     // TODO: This should probably be in `fuel_abi_json::generate_json_abi_program`?
     // If ABI requires knowing config offsets, they should be inputs to ABI gen.
     if let ProgramABI::Fuel(ref mut program_abi) = program_abi {
@@ -1950,12 +1947,7 @@ pub fn compile(
             }
         }
 
-        let configurables_offset: [u8; 8] = configurables_offset.to_be_bytes();
-        let zeroes = 0u64.to_be_bytes();
-        let metadata = [configurables_offset, zeroes, zeroes, zeroes].concat();
-        for (index, byte) in md.iter_mut().enumerate() {
-            *byte = metadata[index];
-        }
+        md = configurables_offset.to_be_bytes();
     }
 
     // We know to set the metadata only for fuelvm right now.
diff --git a/forc-test/src/execute.rs b/forc-test/src/execute.rs
index 467c9b3e7fc..fbfe19498c0 100644
--- a/forc-test/src/execute.rs
+++ b/forc-test/src/execute.rs
@@ -246,21 +246,15 @@ impl TestExecutor {
 /// The following is how the beginning of the bytecode is laid out:
 ///
 /// ```ignore
-/// [ 0] ji   i(4 + 8)                 ; Jumps to the data section setup.
+/// [ 0] ji   i(4 + 2)                 ; Jumps to the data section setup.
 /// [ 1] noop
 /// [ 2] DATA_SECTION_OFFSET[0..32]
 /// [ 3] DATA_SECTION_OFFSET[32..64]
 /// [ 4] METADATA (0-32)
 /// [ 5] METADATA (32-64)
-/// [ 6] METADATA (64-96)
-/// [ 7] METADATA (96-128)
-/// [ 8] METADATA (128-160)
-/// [ 9] METADATA (160-192)
-/// [10] METADATA (192-224)
-/// [11] METADATA (224-256)
-/// [12] lw   $ds $is 1                ; The data section setup, i.e. where the first ji lands.
-/// [13] add  $$ds $$ds $is
-/// [14] <first-entry-point>           ; This is where we want to jump from to our test code!
+/// [ 6] lw   $ds $is 1                ; The data section setup, i.e. where the first ji lands.
+/// [ 7] add  $$ds $$ds $is
+/// [ 8] <first-entry-point>           ; This is where we want to jump from to our test code!
 /// ```
 fn patch_test_bytecode(bytecode: &[u8], test_offset: u32) -> std::borrow::Cow<[u8]> {
     // Each instruction is 4 bytes,
diff --git a/sway-core/src/asm_generation/finalized_asm.rs b/sway-core/src/asm_generation/finalized_asm.rs
index 46a03fb3e67..13fcd5f5ab0 100644
--- a/sway-core/src/asm_generation/finalized_asm.rs
+++ b/sway-core/src/asm_generation/finalized_asm.rs
@@ -116,7 +116,7 @@ fn to_bytecode_mut(
             {
                 8
             }
-            AllocatedOpcode::Metadata => 32,
+            AllocatedOpcode::ConfigurablesOffsetPlaceholder => 8,
             AllocatedOpcode::DataSectionOffsetPlaceholder => 8,
             AllocatedOpcode::BLOB(count) => count.value as u64 * 4,
             AllocatedOpcode::CFEI(i) | AllocatedOpcode::CFSI(i) if i.value == 0 => 0,
@@ -210,7 +210,7 @@ fn to_bytecode_mut(
                 bytecode.extend(data.iter().cloned());
                 half_word_ix += 2;
             }
-            FuelAsmData::Metadata(data) => {
+            FuelAsmData::ConfigurablesOffset(data) => {
                 if build_config.print_bytecode {
                     print!("{}{:#010x} ", " ".repeat(indentation), bytecode.len());
                     println!(
@@ -219,9 +219,9 @@ fn to_bytecode_mut(
                     );
                 }
 
-                // Static assert to ensure that we're only dealing with Metadata,
-                // a 4-word (32 bytes) data within the code. No other uses are known.
-                let _: [u8; 32] = data;
+                // Static assert to ensure that we're only dealing with ConfigurablesOffsetPlaceholder,
+                // a 1-word (8 bytes) data within the code. No other uses are known.
+                let _: [u8; 8] = data;
 
                 bytecode.extend(data.iter().cloned());
                 half_word_ix += 8;
diff --git a/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs b/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs
index 1e0988bd6c7..9c8759c6da0 100644
--- a/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs
+++ b/sway-core/src/asm_generation/fuel/allocated_abstract_instruction_set.rs
@@ -327,9 +327,9 @@ impl AllocatedAbstractInstructionSet {
                             comment: String::new(),
                         });
                     }
-                    ControlFlowOp::Metadata => {
+                    ControlFlowOp::ConfigurablesOffsetPlaceholder => {
                         realized_ops.push(RealizedOp {
-                            opcode: AllocatedOpcode::Metadata,
+                            opcode: AllocatedOpcode::ConfigurablesOffsetPlaceholder,
                             owning_span: None,
                             comment: String::new(),
                         });
@@ -462,7 +462,7 @@ impl AllocatedAbstractInstructionSet {
                 2
             }
 
-            Either::Right(Metadata) => 8,
+            Either::Right(ConfigurablesOffsetPlaceholder) => 2,
 
             Either::Right(PushAll(_)) | Either::Right(PopAll(_)) => unreachable!(
                 "fix me, pushall and popall don't really belong in control flow ops \
diff --git a/sway-core/src/asm_generation/fuel/programs/abstract.rs b/sway-core/src/asm_generation/fuel/programs/abstract.rs
index 3480c565472..5defbee03ae 100644
--- a/sway-core/src/asm_generation/fuel/programs/abstract.rs
+++ b/sway-core/src/asm_generation/fuel/programs/abstract.rs
@@ -165,26 +165,20 @@ impl AbstractProgram {
     /// -    DATA_START (32-64)
     /// 3    METADATA (0-32)
     /// -    METADATA (32-64)
-    /// 4    METADATA (64-96)
-    /// -    METADATA (96-128)
-    /// 5    METADATA (128-160)
-    /// -    METADATA (160-192)
-    /// 6    METADATA (192-224)
-    /// -    METADATA (224-256)
-    /// 7    LW $ds $scratch 1
+    /// 4    LW $ds $scratch 1
     /// -    ADD $ds $ds $scratch
-    /// 8    .program_start:
+    /// 5    .program_start:
     fn build_prologue(&mut self) -> AllocatedAbstractInstructionSet {
         const _: () = assert!(
             crate::PRELUDE_METADATA_OFFSET_IN_BYTES == 16,
             "Inconsistency in the assumption of prelude organisation"
         );
         const _: () = assert!(
-            crate::PRELUDE_METADATA_SIZE_IN_BYTES == 32,
+            crate::PRELUDE_METADATA_SIZE_IN_BYTES == 8,
             "Inconsistency in the assumption of prelude organisation"
         );
         const _: () = assert!(
-            crate::PRELUDE_SIZE_IN_BYTES == 56,
+            crate::PRELUDE_SIZE_IN_BYTES == 32,
             "Inconsistency in the assumption of prelude organisation"
         );
         let label = self.reg_seqr.get_label();
@@ -210,9 +204,9 @@ impl AbstractProgram {
                     comment: "data section offset".into(),
                     owning_span: None,
                 },
-                // word 3 -- 32 bytes placeholder
+                // word 3 -- full word u64 placeholder
                 AllocatedAbstractOp {
-                    opcode: Either::Right(ControlFlowOp::Metadata),
+                    opcode: Either::Right(ControlFlowOp::ConfigurablesOffsetPlaceholder),
                     comment: "metadata".into(),
                     owning_span: None,
                 },
@@ -221,7 +215,7 @@ impl AbstractProgram {
                     comment: "end of metadata".into(),
                     owning_span: None,
                 },
-                // word 7 -- load the data offset into $ds
+                // word 4 -- load the data offset into $ds
                 AllocatedAbstractOp {
                     opcode: Either::Left(AllocatedOpcode::LW(
                         AllocatedRegister::Constant(ConstantRegister::DataSectionStart),
@@ -231,7 +225,7 @@ impl AbstractProgram {
                     comment: "".into(),
                     owning_span: None,
                 },
-                // word 7.5 -- add $ds $ds $is
+                // word 4.5 -- add $ds $ds $is
                 AllocatedAbstractOp {
                     opcode: Either::Left(AllocatedOpcode::ADD(
                         AllocatedRegister::Constant(ConstantRegister::DataSectionStart),
diff --git a/sway-core/src/asm_lang/allocated_ops.rs b/sway-core/src/asm_lang/allocated_ops.rs
index 3c08704545c..170332d4412 100644
--- a/sway-core/src/asm_lang/allocated_ops.rs
+++ b/sway-core/src/asm_lang/allocated_ops.rs
@@ -268,7 +268,7 @@ pub(crate) enum AllocatedOpcode {
 
     /* Non-VM Instructions */
     BLOB(VirtualImmediate24),
-    Metadata,
+    ConfigurablesOffsetPlaceholder,
     DataSectionOffsetPlaceholder,
     LoadDataId(AllocatedRegister, DataId),
     AddrDataId(AllocatedRegister, DataId),
@@ -393,7 +393,7 @@ impl AllocatedOpcode {
 
             /* Non-VM Instructions */
             BLOB(_imm) => vec![],
-            Metadata => vec![],
+            ConfigurablesOffsetPlaceholder => vec![],
             DataSectionOffsetPlaceholder => vec![],
             LoadDataId(r1, _i) => vec![r1],
             AddrDataId(r1, _i) => vec![r1],
@@ -522,7 +522,7 @@ impl fmt::Display for AllocatedOpcode {
 
             /* Non-VM Instructions */
             BLOB(a) => write!(fmtr, "blob {a}"),
-            Metadata => write!(fmtr, "Metadata"),
+            ConfigurablesOffsetPlaceholder => write!(fmtr, "Metadata"),
             DataSectionOffsetPlaceholder => {
                 write!(
                     fmtr,
@@ -561,7 +561,7 @@ impl fmt::Display for AllocatedOp {
 }
 
 pub(crate) enum FuelAsmData {
-    Metadata([u8; 32]),
+    ConfigurablesOffset([u8; 8]),
     DatasectionOffset([u8; 8]),
     Instructions(Vec<fuel_asm::Instruction>),
 }
@@ -735,11 +735,8 @@ impl AllocatedOp {
                         .collect(),
                 )
             }
-            Metadata => {
-                return FuelAsmData::Metadata([
-                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                    0, 0, 0, 0, 0, 0,
-                ])
+            ConfigurablesOffsetPlaceholder => {
+                return FuelAsmData::ConfigurablesOffset([0, 0, 0, 0, 0, 0, 0, 0])
             }
             DataSectionOffsetPlaceholder => {
                 return FuelAsmData::DatasectionOffset(offset_to_data_section.to_be_bytes())
diff --git a/sway-core/src/asm_lang/mod.rs b/sway-core/src/asm_lang/mod.rs
index 7c69aa423cc..99d70eca162 100644
--- a/sway-core/src/asm_lang/mod.rs
+++ b/sway-core/src/asm_lang/mod.rs
@@ -1278,8 +1278,8 @@ pub(crate) enum ControlFlowOp<Reg> {
     Call(Label),
     // Save a return label address in a register.
     SaveRetAddr(Reg, Label),
-    // Placeholder for Metadata
-    Metadata,
+    // Placeholder for the offset into the configurables section.
+    ConfigurablesOffsetPlaceholder,
     // placeholder for the DataSection offset
     DataSectionOffsetPlaceholder,
     // Placeholder for loading an address from the data section.
@@ -1307,11 +1307,7 @@ impl<Reg: fmt::Display> fmt::Display for ControlFlowOp<Reg> {
                 SaveRetAddr(r1, lab) => format!("mova {r1} {lab}"),
                 DataSectionOffsetPlaceholder =>
                     "DATA SECTION OFFSET[0..32]\nDATA SECTION OFFSET[32..64]".into(),
-                Metadata => "METADATA[0..32]\nMETADATA[32..64]\n\
-                     METADATA[64..96]\nMETADATA[96..128]\n\
-                     METADATA[128..160]\nMETADATA[160..192]\n\
-                     METADATA[192..224]\nMETADATA[224..256]"
-                    .into(),
+                ConfigurablesOffsetPlaceholder => "METADATA[0..32]\nMETADATA[32..64]".into(),
                 LoadLabel(r1, lab) => format!("lwlab {r1} {lab}"),
                 PushAll(lab) => format!("pusha {lab}"),
                 PopAll(lab) => format!("popa {lab}"),
@@ -1329,7 +1325,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | Jump(_)
             | Call(_)
             | DataSectionOffsetPlaceholder
-            | Metadata
+            | ConfigurablesOffsetPlaceholder
             | PushAll(_)
             | PopAll(_) => vec![],
 
@@ -1348,7 +1344,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | Call(_)
             | SaveRetAddr(..)
             | DataSectionOffsetPlaceholder
-            | Metadata
+            | ConfigurablesOffsetPlaceholder
             | LoadLabel(..)
             | PushAll(_)
             | PopAll(_) => vec![],
@@ -1370,7 +1366,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | JumpIfNotZero(..)
             | Call(_)
             | DataSectionOffsetPlaceholder
-            | Metadata
+            | ConfigurablesOffsetPlaceholder
             | PushAll(_)
             | PopAll(_) => vec![],
         })
@@ -1392,7 +1388,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | Jump(_)
             | Call(_)
             | DataSectionOffsetPlaceholder
-            | Metadata
+            | ConfigurablesOffsetPlaceholder
             | PushAll(_)
             | PopAll(_) => self.clone(),
 
@@ -1422,7 +1418,7 @@ impl<Reg: Clone + Eq + Ord + Hash> ControlFlowOp<Reg> {
             | Call(_)
             | SaveRetAddr(..)
             | DataSectionOffsetPlaceholder
-            | Metadata
+            | ConfigurablesOffsetPlaceholder
             | LoadLabel(..)
             | PushAll(_)
             | PopAll(_) => (),
@@ -1479,7 +1475,7 @@ impl ControlFlowOp<VirtualRegister> {
             Jump(label) => Jump(*label),
             Call(label) => Call(*label),
             DataSectionOffsetPlaceholder => DataSectionOffsetPlaceholder,
-            Metadata => Metadata,
+            ConfigurablesOffsetPlaceholder => ConfigurablesOffsetPlaceholder,
             PushAll(label) => PushAll(*label),
             PopAll(label) => PopAll(*label),
 
diff --git a/sway-core/src/asm_lang/virtual_ops.rs b/sway-core/src/asm_lang/virtual_ops.rs
index 17d3e281c0c..84eb5b54c86 100644
--- a/sway-core/src/asm_lang/virtual_ops.rs
+++ b/sway-core/src/asm_lang/virtual_ops.rs
@@ -1750,7 +1750,7 @@ impl VirtualOp {
             /* Non-VM Instructions */
             BLOB(imm) => AllocatedOpcode::BLOB(imm.clone()),
             DataSectionOffsetPlaceholder => AllocatedOpcode::DataSectionOffsetPlaceholder,
-            Metadata => AllocatedOpcode::Metadata,
+            Metadata => AllocatedOpcode::ConfigurablesOffsetPlaceholder,
             LoadDataId(reg1, label) => {
                 AllocatedOpcode::LoadDataId(map_reg(&mapping, reg1), label.clone())
             }
diff --git a/sway-core/src/lib.rs b/sway-core/src/lib.rs
index b7f99e2cceb..ba241a8188a 100644
--- a/sway-core/src/lib.rs
+++ b/sway-core/src/lib.rs
@@ -995,11 +995,11 @@ pub fn compile_to_bytecode(
 }
 
 /// Size of the prelude's METADATA section, in bytes.
-pub const PRELUDE_METADATA_SIZE_IN_BYTES: usize = 32;
+pub const PRELUDE_METADATA_SIZE_IN_BYTES: usize = 8;
 /// Offset (in bytes) of the METADATA section in the prelude.
 pub const PRELUDE_METADATA_OFFSET_IN_BYTES: usize = 16;
 /// Total size of the prelude in bytes. Instructions start right after.
-pub const PRELUDE_SIZE_IN_BYTES: usize = 56;
+pub const PRELUDE_SIZE_IN_BYTES: usize = 32;
 
 /// Given bytecode, overwrite the existing Metadata in the prelude with the given one.
 pub fn set_bytecode_metadata(

From 566560dc9b841475368a38500d1d1119ea80e6a7 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 23 Oct 2024 11:52:35 +0530
Subject: [PATCH 30/38] fix bug in computing half_word_idx

---
 sway-core/src/asm_generation/finalized_asm.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sway-core/src/asm_generation/finalized_asm.rs b/sway-core/src/asm_generation/finalized_asm.rs
index 4388e7186e3..c132d687855 100644
--- a/sway-core/src/asm_generation/finalized_asm.rs
+++ b/sway-core/src/asm_generation/finalized_asm.rs
@@ -219,7 +219,7 @@ fn to_bytecode_mut(
                 let _: [u8; 8] = data;
 
                 bytecode.extend(data.iter().cloned());
-                half_word_ix += 8;
+                half_word_ix += 2;
             }
             FuelAsmData::Instructions(instructions) => {
                 for instruction in instructions {

From 90a1b915fb0bff6f526937282540048ca79d82b3 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 23 Oct 2024 12:01:10 +0530
Subject: [PATCH 31/38] more fixes

---
 forc-pkg/src/pkg.rs                            |  4 ++--
 forc/src/cli/commands/parse_bytecode.rs        |  8 ++++++--
 .../asm_generation/fuel/programs/abstract.rs   |  8 ++++----
 sway-core/src/asm_lang/mod.rs                  |  3 ++-
 sway-core/src/lib.rs                           | 18 +++++++++---------
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/forc-pkg/src/pkg.rs b/forc-pkg/src/pkg.rs
index 0576ec3bc67..26056950242 100644
--- a/forc-pkg/src/pkg.rs
+++ b/forc-pkg/src/pkg.rs
@@ -49,7 +49,7 @@ use sway_core::{
     transform::AttributeKind,
     write_dwarf, BuildTarget, Engines, FinalizedEntry, LspConfig,
 };
-use sway_core::{set_bytecode_metadata, PrintAsm, PrintIr};
+use sway_core::{set_bytecode_configurables_offset, PrintAsm, PrintIr};
 use sway_error::{error::CompileError, handler::Handler, warning::CompileWarning};
 use sway_types::constants::{CORE, PRELUDE, STD};
 use sway_types::{Ident, Span, Spanned};
@@ -1950,7 +1950,7 @@ pub fn compile(
 
     // We know to set the metadata only for fuelvm right now.
     if let BuildTarget::Fuel = pkg.target {
-        set_bytecode_metadata(&mut compiled, &md);
+        set_bytecode_configurables_offset(&mut compiled, &md);
     }
 
     metrics.bytecode_size = compiled.bytecode.len();
diff --git a/forc/src/cli/commands/parse_bytecode.rs b/forc/src/cli/commands/parse_bytecode.rs
index 2844f1216f4..4d5ecf0bdb6 100644
--- a/forc/src/cli/commands/parse_bytecode.rs
+++ b/forc/src/cli/commands/parse_bytecode.rs
@@ -59,9 +59,13 @@ pub(crate) fn exec(command: Command) -> ForcResult<()> {
                     parsed_raw
                 )
             }
-            Err(fuel_asm::InvalidOpcode) if (4..12).contains(&word_ix) => {
+            Err(fuel_asm::InvalidOpcode) if word_ix == 4 || word_ix == 5 => {
                 let parsed_raw = u32::from_be_bytes([raw[0], raw[1], raw[2], raw[3]]);
-                format!("Metadata[{}] ({})", word_ix - 4, parsed_raw)
+                format!(
+                    "configurables offset {} ({})",
+                    if word_ix == 4 { "lo" } else { "hi" },
+                    parsed_raw
+                )
             }
             Ok(_) | Err(fuel_asm::InvalidOpcode) => "".into(),
         };
diff --git a/sway-core/src/asm_generation/fuel/programs/abstract.rs b/sway-core/src/asm_generation/fuel/programs/abstract.rs
index e12fb0ecd3a..4ebac601ecd 100644
--- a/sway-core/src/asm_generation/fuel/programs/abstract.rs
+++ b/sway-core/src/asm_generation/fuel/programs/abstract.rs
@@ -168,18 +168,18 @@ impl AbstractProgram {
     /// -    JMPF $zero i10
     /// 2    DATA_START (0-32) (in bytes, offset from $is)
     /// -    DATA_START (32-64)
-    /// 3    METADATA (0-32)
-    /// -    METADATA (32-64)
+    /// 3    CONFIGURABLES_OFFSET (0-32)
+    /// -    CONFIGURABLES_OFFSET (32-64)
     /// 4    LW $ds $scratch 1
     /// -    ADD $ds $ds $scratch
     /// 5    .program_start:
     fn build_prologue(&mut self) -> AllocatedAbstractInstructionSet {
         const _: () = assert!(
-            crate::PRELUDE_METADATA_OFFSET_IN_BYTES == 16,
+            crate::PRELUDE_CONFIGURABLES_OFFSET_IN_BYTES == 16,
             "Inconsistency in the assumption of prelude organisation"
         );
         const _: () = assert!(
-            crate::PRELUDE_METADATA_SIZE_IN_BYTES == 8,
+            crate::PRELUDE_CONFIGURABLES_SIZE_IN_BYTES == 8,
             "Inconsistency in the assumption of prelude organisation"
         );
         const _: () = assert!(
diff --git a/sway-core/src/asm_lang/mod.rs b/sway-core/src/asm_lang/mod.rs
index 99d70eca162..a7f95984d41 100644
--- a/sway-core/src/asm_lang/mod.rs
+++ b/sway-core/src/asm_lang/mod.rs
@@ -1307,7 +1307,8 @@ impl<Reg: fmt::Display> fmt::Display for ControlFlowOp<Reg> {
                 SaveRetAddr(r1, lab) => format!("mova {r1} {lab}"),
                 DataSectionOffsetPlaceholder =>
                     "DATA SECTION OFFSET[0..32]\nDATA SECTION OFFSET[32..64]".into(),
-                ConfigurablesOffsetPlaceholder => "METADATA[0..32]\nMETADATA[32..64]".into(),
+                ConfigurablesOffsetPlaceholder =>
+                    "CONFIGURABLES_OFFSET[0..32]\nCONFIGURABLES_OFFSET[32..64]".into(),
                 LoadLabel(r1, lab) => format!("lwlab {r1} {lab}"),
                 PushAll(lab) => format!("pusha {lab}"),
                 PopAll(lab) => format!("popa {lab}"),
diff --git a/sway-core/src/lib.rs b/sway-core/src/lib.rs
index ba241a8188a..0feda2ce733 100644
--- a/sway-core/src/lib.rs
+++ b/sway-core/src/lib.rs
@@ -994,25 +994,25 @@ pub fn compile_to_bytecode(
     asm_to_bytecode(handler, asm_res, source_map, engines.se(), build_config)
 }
 
-/// Size of the prelude's METADATA section, in bytes.
-pub const PRELUDE_METADATA_SIZE_IN_BYTES: usize = 8;
-/// Offset (in bytes) of the METADATA section in the prelude.
-pub const PRELUDE_METADATA_OFFSET_IN_BYTES: usize = 16;
+/// Size of the prelude's CONFIGURABLES_OFFSET section, in bytes.
+pub const PRELUDE_CONFIGURABLES_SIZE_IN_BYTES: usize = 8;
+/// Offset (in bytes) of the CONFIGURABLES_OFFSET section in the prelude.
+pub const PRELUDE_CONFIGURABLES_OFFSET_IN_BYTES: usize = 16;
 /// Total size of the prelude in bytes. Instructions start right after.
 pub const PRELUDE_SIZE_IN_BYTES: usize = 32;
 
-/// Given bytecode, overwrite the existing Metadata in the prelude with the given one.
-pub fn set_bytecode_metadata(
+/// Given bytecode, overwrite the existing offset to configurables offset in the prelude with the given one.
+pub fn set_bytecode_configurables_offset(
     compiled_bytecode: &mut CompiledBytecode,
-    md: &[u8; PRELUDE_METADATA_SIZE_IN_BYTES],
+    md: &[u8; PRELUDE_CONFIGURABLES_SIZE_IN_BYTES],
 ) {
     assert!(
         compiled_bytecode.bytecode.len()
-            >= PRELUDE_METADATA_OFFSET_IN_BYTES + PRELUDE_METADATA_SIZE_IN_BYTES
+            >= PRELUDE_CONFIGURABLES_OFFSET_IN_BYTES + PRELUDE_CONFIGURABLES_SIZE_IN_BYTES
     );
     let code = &mut compiled_bytecode.bytecode;
     for (index, byte) in md.iter().enumerate() {
-        code[index + PRELUDE_METADATA_OFFSET_IN_BYTES] = *byte;
+        code[index + PRELUDE_CONFIGURABLES_OFFSET_IN_BYTES] = *byte;
     }
 }
 

From b8d4e96db26e161087fa9f1f335deba4175c3093 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 23 Oct 2024 12:18:08 +0530
Subject: [PATCH 32/38] some test updates

---
 forc-plugins/forc-client/tests/deploy.rs | 6 +++---
 forc/tests/cli_integration.rs            | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs
index dae3c123f51..3d92ac46a70 100644
--- a/forc-plugins/forc-client/tests/deploy.rs
+++ b/forc-plugins/forc-client/tests/deploy.rs
@@ -373,7 +373,7 @@ async fn test_simple_deploy() {
     node.kill().unwrap();
     let expected = vec![DeployedPackage::Contract(DeployedContract {
         id: ContractId::from_str(
-            "e50f0b4b396504398c0aff45951b1e44e108399c856cb92257dfa58fe96d53eb",
+            "adcd0480deb735ffd8f5bd0683b66c55465e0841076efca4c28be25c767ede5b",
         )
         .unwrap(),
         proxy: None,
@@ -416,7 +416,7 @@ async fn test_deploy_submit_only() {
     node.kill().unwrap();
     let expected = vec![DeployedPackage::Contract(DeployedContract {
         id: ContractId::from_str(
-            "e50f0b4b396504398c0aff45951b1e44e108399c856cb92257dfa58fe96d53eb",
+            "adcd0480deb735ffd8f5bd0683b66c55465e0841076efca4c28be25c767ede5b",
         )
         .unwrap(),
         proxy: None,
@@ -462,7 +462,7 @@ async fn test_deploy_fresh_proxy() {
     node.kill().unwrap();
     let impl_contract = DeployedPackage::Contract(DeployedContract {
         id: ContractId::from_str(
-            "e50f0b4b396504398c0aff45951b1e44e108399c856cb92257dfa58fe96d53eb",
+            "adcd0480deb735ffd8f5bd0683b66c55465e0841076efca4c28be25c767ede5b",
         )
         .unwrap(),
         proxy: Some(
diff --git a/forc/tests/cli_integration.rs b/forc/tests/cli_integration.rs
index 0671c875626..7aaf4f054de 100644
--- a/forc/tests/cli_integration.rs
+++ b/forc/tests/cli_integration.rs
@@ -49,10 +49,10 @@ fn test_forc_test_raw_logs() -> Result<(), rexpect::error::Error> {
     // Assert that the output is correct
     process.exp_string("      test test_log_4")?;
     process.exp_string("Raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12684,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12660,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
     process.exp_string("      test test_log_2")?;
     process.exp_string("Raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12684,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12660,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
 
     process.process.exit()?;
     Ok(())
@@ -74,11 +74,11 @@ fn test_forc_test_both_logs() -> Result<(), rexpect::error::Error> {
     process.exp_string("      test test_log_4")?;
     process.exp_string("Decoded log value: 4, log rb: 1515152261580153489")?;
     process.exp_string("Raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12684,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000004","digest":"8005f02d43fa06e7d0585fb64c961d57e318b27a145c857bcd3a6bdb413ff7fc","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12660,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
     process.exp_string("      test test_log_2")?;
     process.exp_string("Decoded log value: 2, log rb: 1515152261580153489")?;
     process.exp_string("Raw logs:")?;
-    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12684,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
+    process.exp_string(r#"[{"LogData":{"data":"0000000000000002","digest":"cd04a4754498e06db5a13c5f371f1f04ff6d2470f24aa9bd886540e5dce77f70","id":"0000000000000000000000000000000000000000000000000000000000000000","is":10368,"len":8,"pc":12660,"ptr":67107840,"ra":0,"rb":1515152261580153489}}]"#)?;
     process.process.exit()?;
     Ok(())
 }

From 67842f361ab3bd6da87c3c7b7e679f6f54121e59 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 23 Oct 2024 12:37:37 +0530
Subject: [PATCH 33/38] test updates

---
 .../json_abi_oracle_new_encoding.json         | 32 +++++++++----------
 .../json_abi_oracle_new_encoding.json         |  2 +-
 .../array_of_structs_caller/src/main.sw       |  2 +-
 .../asset_ops_test/src/main.sw                |  2 +-
 .../bal_opcode/src/main.sw                    |  2 +-
 .../call_abi_with_tuples/src/main.sw          |  2 +-
 .../call_basic_storage/src/main.sw            |  2 +-
 .../src/main.sw                               |  2 +-
 .../call_increment_contract/src/main.sw       |  2 +-
 .../call_storage_enum/src/main.sw             |  2 +-
 .../caller_auth_test/src/main.sw              |  2 +-
 .../caller_context_test/src/main.sw           |  2 +-
 .../nested_struct_args_caller/src/main.sw     |  2 +-
 .../storage_access_caller/src/main.sw         |  2 +-
 14 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
index 2daeaffdc6a..4447c387c37 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.json
@@ -62,82 +62,82 @@
     {
       "concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
       "name": "BOOL",
-      "offset": 6896
+      "offset": 7056
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "U8",
-      "offset": 7088
+      "offset": 7248
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "ANOTHER_U8",
-      "offset": 6824
+      "offset": 6984
     },
     {
       "concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
       "name": "U16",
-      "offset": 7032
+      "offset": 7192
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
       "name": "U32",
-      "offset": 7072
+      "offset": 7232
     },
     {
       "concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
       "name": "U64",
-      "offset": 7080
+      "offset": 7240
     },
     {
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
       "name": "U256",
-      "offset": 7040
+      "offset": 7200
     },
     {
       "concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
       "name": "B256",
-      "offset": 6864
+      "offset": 7024
     },
     {
       "concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff",
       "name": "CONFIGURABLE_STRUCT",
-      "offset": 6984
+      "offset": 7144
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
       "name": "CONFIGURABLE_ENUM_A",
-      "offset": 6904
+      "offset": 7064
     },
     {
       "concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
       "name": "CONFIGURABLE_ENUM_B",
-      "offset": 6944
+      "offset": 7104
     },
     {
       "concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6",
       "name": "ARRAY_BOOL",
-      "offset": 6832
+      "offset": 6992
     },
     {
       "concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199",
       "name": "ARRAY_U64",
-      "offset": 6840
+      "offset": 7000
     },
     {
       "concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be",
       "name": "TUPLE_BOOL_U64",
-      "offset": 7016
+      "offset": 7176
     },
     {
       "concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
       "name": "STR_4",
-      "offset": 7008
+      "offset": 7168
     },
     {
       "concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
       "name": "NOT_USED",
-      "offset": 7000
+      "offset": 7160
     }
   ],
   "encodingVersion": "1",
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
index 739e4852d66..33f149499d6 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/u256/u256_abi/json_abi_oracle_new_encoding.json
@@ -9,7 +9,7 @@
     {
       "concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
       "name": "SOME_U256",
-      "offset": 888
+      "offset": 864
     }
   ],
   "encodingVersion": "1",
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
index a7ae9027c59..3150cc69907 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/array_of_structs_caller/src/main.sw
@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x14ed3cd06c2947248f69d54bfa681fe40d26267be84df7e19e253622b7921bbe;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xa297e99c5a9bfe19a6bd001b5c32ee9af3c322a632be8f0089ce5fe9c95108b6; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release
+const CONTRACT_ID = 0x91c3e72c3b3f4bf7bd5c548d8752c766d5fb8ebf15be3cf92ff34682da9bfb4d; // AUTO-CONTRACT-ID ../../test_contracts/array_of_structs_contract --release
 
 fn get_address() -> Option<std::address::Address> {
     Some(CONTRACT_ID.into())
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
index 219a600c254..4887dd0cc33 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
@@ -14,7 +14,7 @@ const FUEL_COIN_CONTRACT_ID = 0x4fd649815ef56746fa57d1d4a5667962d780af225a58d3a0
 #[cfg(experimental_new_encoding = false)]
 const BALANCE_CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;
 #[cfg(experimental_new_encoding = true)]
-const BALANCE_CONTRACT_ID = 0x0a2a2f1751c2a23575cf5fb050d144e786d5b018fd34bf594c6bfdbff8afd795; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
+const BALANCE_CONTRACT_ID = 0xc0ae93ca2a6ec1c740a4869a3f5bfe061184e30e4e5c6185891d3ec2dba9a33d; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
 
 fn main() -> bool {
     let default_gas = 1_000_000_000_000;
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
index 93ef8310ab4..448359905b5 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/bal_opcode/src/main.sw
@@ -5,7 +5,7 @@ use balance_test_abi::BalanceTest;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x0a2a2f1751c2a23575cf5fb050d144e786d5b018fd34bf594c6bfdbff8afd795; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
+const CONTRACT_ID = 0xc0ae93ca2a6ec1c740a4869a3f5bfe061184e30e4e5c6185891d3ec2dba9a33d; // AUTO-CONTRACT-ID ../../test_contracts/balance_test_contract --release
 
 fn main() -> bool {
     let balance_test_contract = abi(BalanceTest, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
index 7cbfdd990d9..7778fd9369b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_abi_with_tuples/src/main.sw
@@ -6,7 +6,7 @@ use abi_with_tuples::{MyContract, Location, Person};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xfdc14550c8aee742cd556d0ab7f378b7be0d3b1e6e086c097352e94590d4ed02;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xa701688d0a5903e4b065cdaff94a166fda0eca0128bfd1e1105236186a268aee; // AUTO-CONTRACT-ID ../../test_contracts/abi_with_tuples_contract --release
+const CONTRACT_ID = 0xeb1d43bccc97620c80599c25722b1be3a22affd0570cfdcc57deac7c729e5389; // AUTO-CONTRACT-ID ../../test_contracts/abi_with_tuples_contract --release
 
 fn main() -> bool {
     let the_abi = abi(MyContract, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
index 1f66a607f42..d519240f19d 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_basic_storage/src/main.sw
@@ -4,7 +4,7 @@ use basic_storage_abi::{BasicStorage, Quad};
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x94db39f409a31b9f2ebcadeea44378e419208c20de90f5d8e1e33dc1523754cb;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xfa786fd319eeb24fe328ceb0e033779ba444962f5534ec4ec24dc6686d3fdc1d; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
+const CONTRACT_ID = 0x770eb6e1b7de06098474e110cac9ed32c72c455ba7f34bea00ebb47a43986701; // AUTO-CONTRACT-ID ../../test_contracts/basic_storage --release
 
 fn main() -> u64 {
     let addr = abi(BasicStorage, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
index 9f049140617..cf03386a260 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_contract_with_type_aliases/src/main.sw
@@ -5,7 +5,7 @@ use contract_with_type_aliases_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x0cbeb6efe3104b460be769bdc4ea101ebf16ccc16f2d7b667ec3e1c7f5ce35b5;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xf4cc66190a144f6dd4c63c5507717919c467c62bdcd87ff29d2bf5c3cb9f7a87; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release
+const CONTRACT_ID = 0xeaca08f0be3635638eb1cd1467f1d72daea95fa9e5e518d388f77ce828da1276; // AUTO-CONTRACT-ID ../../test_contracts/contract_with_type_aliases --release
 
 fn main() {
     let caller = abi(MyContract, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
index 7fe8b34f24d..cdc8f7d508a 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_increment_contract/src/main.sw
@@ -6,7 +6,7 @@ use dynamic_contract_call::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xd1b4047af7ef111c023ab71069e01dc2abfde487c0a0ce1268e4f447e6c6e4c2;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x7741739041b88739c1abb156d4b63e4ba564b044883a81f682d2c22a31113a16; // AUTO-CONTRACT-ID ../../test_contracts/increment_contract --release
+const CONTRACT_ID = 0x3a0ad1930a751f3849e10d55aedad4b14be604a1807b3016db959a311dbbd101; // AUTO-CONTRACT-ID ../../test_contracts/increment_contract --release
 
 fn main() -> bool {
     let the_abi = abi(Incrementor, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
index 76deab07d0e..c91268acb0f 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/call_storage_enum/src/main.sw
@@ -5,7 +5,7 @@ use storage_enum_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xc601d11767195485a6654d566c67774134668863d8c797a8c69e8778fb1f89e9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xcd0c5b696dd0d7f1e673f692260fb6cb2076cc745b6f5afb386462c4a2831528; // AUTO-CONTRACT-ID ../../test_contracts/storage_enum_contract --release
+const CONTRACT_ID = 0x14df60f48d5874d2623ba7f5604987b29f6288a1ae35a130bfae57e64f74aa89; // AUTO-CONTRACT-ID ../../test_contracts/storage_enum_contract --release
 
 fn main() -> u64 {
     let caller = abi(StorageEnum, CONTRACT_ID);
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
index c72489bf0d0..ec50cbe43bd 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_auth_test/src/main.sw
@@ -5,7 +5,7 @@ use auth_testing_abi::AuthTesting;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xc2eec20491b53aab7232cbd27c31d15417b4e9daf0b89c74cc242ef1295f681f;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x95387ebd6b972ea36bdbf1468c1d6b24c7e3c9ae220c3a63b3a519d22087691d; // AUTO-CONTRACT-ID ../../test_contracts/auth_testing_contract --release
+const CONTRACT_ID = 0xa3ee3b5d5469efa870ba468c36c3775ea5287da385d70fbcd4aadbf5acb5a772; // AUTO-CONTRACT-ID ../../test_contracts/auth_testing_contract --release
 
 // should be false in the case of a script
 fn main() -> bool {
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
index ac2ba8b6880..65bca7c89cd 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/caller_context_test/src/main.sw
@@ -6,7 +6,7 @@ use context_testing_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x6054c11cda000f5990373a4d61929396165be4dfdd61d5b7bd26da60ab0d8577;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x0904175568c7baaa3be0fc60d85aa072dfb0aed3667a7879f47e8d77bbcbcb18; // AUTO-CONTRACT-ID ../../test_contracts/context_testing_contract --release
+const CONTRACT_ID = 0x16f15adbe1fbdee5d19349fc245429dad3265f8a0f7a8143ffec39de8c809ff4; // AUTO-CONTRACT-ID ../../test_contracts/context_testing_contract --release
 
 fn main() -> bool {
     let gas: u64 = u64::max();
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
index 8f245299a1d..505fff93133 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/nested_struct_args_caller/src/main.sw
@@ -5,7 +5,7 @@ use nested_struct_args_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0xe63d33a1b3a6903808b379f6a41a72fa8a370e8b76626775e7d9d2f9c4c5da40;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0x287d5a3cad5833647ca3c48816dd4c1a3c429b55b0d1d0a8ba07065d62e78507; // AUTO-CONTRACT-ID ../../test_contracts/nested_struct_args_contract --release
+const CONTRACT_ID = 0xd9e836ce255122c0c243cb0bd6d10450d87206f995d127e60e90bf9ab4fc3532; // AUTO-CONTRACT-ID ../../test_contracts/nested_struct_args_contract --release
 
 fn main() -> bool {
     let caller = abi(NestedStructArgs, CONTRACT_ID);
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 d8f0d656e18..33f80e65b6b 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
@@ -6,7 +6,7 @@ use std::hash::*;
 #[cfg(experimental_new_encoding = false)]
 const CONTRACT_ID = 0x3bc28acd66d327b8c1b9624c1fabfc07e9ffa1b5d71c2832c3bfaaf8f4b805e9;
 #[cfg(experimental_new_encoding = true)]
-const CONTRACT_ID = 0xdc525dd2ea57aa691d4d61acd725ebbefd974eaeb397598ca90c38807dc749bb; // AUTO-CONTRACT-ID ../../test_contracts/storage_access_contract --release
+const CONTRACT_ID = 0x9075162ba3ecabb57aae8ddcd785d8a1211d08281de71c34a1772a888e339ba1; // AUTO-CONTRACT-ID ../../test_contracts/storage_access_contract --release
 
 fn main() -> bool {
     let caller = abi(StorageAccess, CONTRACT_ID);

From 9e99d74db130625973bd4a00cbfc7027c8cb4bb5 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 23 Oct 2024 13:38:44 +0530
Subject: [PATCH 34/38] more test updates

---
 forc-plugins/forc-client/tests/deploy.rs                      | 2 +-
 .../require_contract_deployment/asset_ops_test/src/main.sw    | 2 +-
 test/src/sdk-harness/test_projects/auth/mod.rs                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forc-plugins/forc-client/tests/deploy.rs b/forc-plugins/forc-client/tests/deploy.rs
index 3d92ac46a70..8f428a6aa6e 100644
--- a/forc-plugins/forc-client/tests/deploy.rs
+++ b/forc-plugins/forc-client/tests/deploy.rs
@@ -467,7 +467,7 @@ async fn test_deploy_fresh_proxy() {
         .unwrap(),
         proxy: Some(
             ContractId::from_str(
-                "1c50e2d4d602fdd88b47fb7b84b7f87bbdefcf9b7e5985bb7ceeee9266a8e977",
+                "5297238a1d867c9d7c8fa83c700e2d0d1c57e1874ec95ff4a67063e222ab1880",
             )
             .unwrap(),
         ),
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
index 4887dd0cc33..685e3d5444b 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/require_contract_deployment/asset_ops_test/src/main.sw
@@ -9,7 +9,7 @@ use test_fuel_coin_abi::*;
 #[cfg(experimental_new_encoding = false)]
 const FUEL_COIN_CONTRACT_ID = 0xec2277ebe007ade87e3d797c3b1e070dcd542d5ef8f038b471f262ef9cebc87c;
 #[cfg(experimental_new_encoding = true)]
-const FUEL_COIN_CONTRACT_ID = 0x4fd649815ef56746fa57d1d4a5667962d780af225a58d3a0409d41bc72806a9f;
+const FUEL_COIN_CONTRACT_ID = 0x19c0d374734bd8a92b776787e9dffa0f105a90e3c977626f93a1916de54dd714;
 
 #[cfg(experimental_new_encoding = false)]
 const BALANCE_CONTRACT_ID = 0xf6cd545152ac83225e8e7df2efb5c6fa6e37bc9b9e977b5ea8103d28668925df;
diff --git a/test/src/sdk-harness/test_projects/auth/mod.rs b/test/src/sdk-harness/test_projects/auth/mod.rs
index 9b34e42b02a..5c167a1d927 100644
--- a/test/src/sdk-harness/test_projects/auth/mod.rs
+++ b/test/src/sdk-harness/test_projects/auth/mod.rs
@@ -624,7 +624,7 @@ async fn can_get_predicate_address() {
 
     // Setup predicate.
     let hex_predicate_address: &str =
-        "0x7f1402b869d09809aa52814b0b7effd4db1dc9f56345cd8878f979c8df78803f";
+        "0x8b300a68337368654e71c65ae93c3d9eb3b9837d0c11d770cbf8740a6a5a8631";
     let predicate_address =
         Address::from_str(hex_predicate_address).expect("failed to create Address from string");
     let predicate_bech32_address = Bech32Address::from(predicate_address);
@@ -750,7 +750,7 @@ async fn when_incorrect_predicate_address_passed() {
 async fn can_get_predicate_address_in_message() {
     // Setup predicate address.
     let hex_predicate_address: &str =
-        "0x7f1402b869d09809aa52814b0b7effd4db1dc9f56345cd8878f979c8df78803f";
+        "0x8b300a68337368654e71c65ae93c3d9eb3b9837d0c11d770cbf8740a6a5a8631";
     let predicate_address =
         Address::from_str(hex_predicate_address).expect("failed to create Address from string");
     let predicate_bech32_address = Bech32Address::from(predicate_address);

From f2fdaa11992be34e00261288c34ba5198f2c9875 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Wed, 23 Oct 2024 14:03:34 +0530
Subject: [PATCH 35/38] update code size for configurable_dedup_decode

---
 .../should_pass/language/configurable_dedup_decode/stdout.snap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap
index 283bf9e035f..be59f759d26 100644
--- a/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap
+++ b/test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode/stdout.snap
@@ -1,5 +1,6 @@
 ---
 source: test/tests/tests.rs
+assertion_line: 99
 ---
 > forc build --path test/src/e2e_vm_tests/test_programs/should_pass/language/configurable_dedup_decode --release --ir final
 exit status: 0
@@ -358,4 +359,4 @@ script {
 !127 = fn_call_path_span !0 235 236
 !128 = (!126 !127)
 
-    Finished release [optimized + fuel] target(s) [736 B] in ???
+    Finished release [optimized + fuel] target(s) [744 B] in ???

From e185ef2b38e8ebc7711b1faa701b4b2f2c0c989b Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 24 Oct 2024 06:51:29 +0530
Subject: [PATCH 36/38] incorporate review comments. uniformly rename metadata

---
 forc-test/src/execute.rs                         |  4 ++--
 .../src/asm_generation/fuel/programs/abstract.rs |  4 ++--
 sway-core/src/asm_lang/mod.rs                    |  2 +-
 sway-core/src/asm_lang/virtual_ops.rs            | 16 ++++++++--------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/forc-test/src/execute.rs b/forc-test/src/execute.rs
index fbfe19498c0..76e89324903 100644
--- a/forc-test/src/execute.rs
+++ b/forc-test/src/execute.rs
@@ -250,8 +250,8 @@ impl TestExecutor {
 /// [ 1] noop
 /// [ 2] DATA_SECTION_OFFSET[0..32]
 /// [ 3] DATA_SECTION_OFFSET[32..64]
-/// [ 4] METADATA (0-32)
-/// [ 5] METADATA (32-64)
+/// [ 4] CONFIGURABLES_OFFSET[0..32]
+/// [ 5] CONFIGURABLES_OFFSET[32..64]
 /// [ 6] lw   $ds $is 1                ; The data section setup, i.e. where the first ji lands.
 /// [ 7] add  $$ds $$ds $is
 /// [ 8] <first-entry-point>           ; This is where we want to jump from to our test code!
diff --git a/sway-core/src/asm_generation/fuel/programs/abstract.rs b/sway-core/src/asm_generation/fuel/programs/abstract.rs
index 4ebac601ecd..f0d3ef949a1 100644
--- a/sway-core/src/asm_generation/fuel/programs/abstract.rs
+++ b/sway-core/src/asm_generation/fuel/programs/abstract.rs
@@ -212,12 +212,12 @@ impl AbstractProgram {
                 // word 3 -- full word u64 placeholder
                 AllocatedAbstractOp {
                     opcode: Either::Right(ControlFlowOp::ConfigurablesOffsetPlaceholder),
-                    comment: "metadata".into(),
+                    comment: "configurables offset".into(),
                     owning_span: None,
                 },
                 AllocatedAbstractOp {
                     opcode: Either::Right(ControlFlowOp::Label(label)),
-                    comment: "end of metadata".into(),
+                    comment: "end of configurables offset".into(),
                     owning_span: None,
                 },
                 // word 4 -- load the data offset into $ds
diff --git a/sway-core/src/asm_lang/mod.rs b/sway-core/src/asm_lang/mod.rs
index a7f95984d41..71e09cc2290 100644
--- a/sway-core/src/asm_lang/mod.rs
+++ b/sway-core/src/asm_lang/mod.rs
@@ -1248,7 +1248,7 @@ impl fmt::Display for VirtualOp {
             /* Non-VM Instructions */
             BLOB(a) => write!(fmtr, "blob {a}"),
             DataSectionOffsetPlaceholder => write!(fmtr, "data section offset placeholder"),
-            Metadata => write!(fmtr, "Metadata"),
+            ConfigurablesOffsetPlaceholder => write!(fmtr, "configurables offset placeholder"),
             LoadDataId(a, b) => write!(fmtr, "load {a} {b}"),
             AddrDataId(a, b) => write!(fmtr, "addr {a} {b}"),
             Undefined => write!(fmtr, "undefined op"),
diff --git a/sway-core/src/asm_lang/virtual_ops.rs b/sway-core/src/asm_lang/virtual_ops.rs
index 84eb5b54c86..3d041713a4f 100644
--- a/sway-core/src/asm_lang/virtual_ops.rs
+++ b/sway-core/src/asm_lang/virtual_ops.rs
@@ -226,7 +226,7 @@ pub(crate) enum VirtualOp {
 
     /* Non-VM Instructions */
     BLOB(VirtualImmediate24),
-    Metadata,
+    ConfigurablesOffsetPlaceholder,
     DataSectionOffsetPlaceholder,
     // LoadDataId takes a virtual register and a DataId, which points to a labeled piece
     // of data in the data section. Note that the ASM op corresponding to a LW is
@@ -348,7 +348,7 @@ impl VirtualOp {
             /* Non-VM Instructions */
             BLOB(_imm) => vec![],
             DataSectionOffsetPlaceholder => vec![],
-            Metadata => vec![],
+            ConfigurablesOffsetPlaceholder => vec![],
             LoadDataId(r1, _i) => vec![r1],
             AddrDataId(r1, _) => vec![r1],
 
@@ -467,7 +467,7 @@ impl VirtualOp {
             // Virtual OPs
             | BLOB(_)
             | DataSectionOffsetPlaceholder
-            | Metadata
+            | ConfigurablesOffsetPlaceholder
             | Undefined => true
         }
     }
@@ -574,7 +574,7 @@ impl VirtualOp {
             | GTF(_, _, _)
             | BLOB(_)
             | DataSectionOffsetPlaceholder
-            | Metadata
+            | ConfigurablesOffsetPlaceholder
             | LoadDataId(_, _)
             | AddrDataId(_, _)
             | Undefined => vec![],
@@ -696,7 +696,7 @@ impl VirtualOp {
             /* Non-VM Instructions */
             BLOB(_imm) => vec![],
             DataSectionOffsetPlaceholder => vec![],
-            Metadata => vec![],
+            ConfigurablesOffsetPlaceholder => vec![],
             LoadDataId(_r1, _i) => vec![],
             AddrDataId(_r1, _i) => vec![],
 
@@ -820,7 +820,7 @@ impl VirtualOp {
             LoadDataId(r1, _i) => vec![r1],
             AddrDataId(r1, _i) => vec![r1],
             DataSectionOffsetPlaceholder => vec![],
-            Metadata => vec![],
+            ConfigurablesOffsetPlaceholder => vec![],
             Undefined => vec![],
         })
         .into_iter()
@@ -1269,7 +1269,7 @@ impl VirtualOp {
             /* Non-VM Instructions */
             BLOB(i) => Self::BLOB(i.clone()),
             DataSectionOffsetPlaceholder => Self::DataSectionOffsetPlaceholder,
-            Metadata => Self::Metadata,
+            ConfigurablesOffsetPlaceholder => Self::ConfigurablesOffsetPlaceholder,
             LoadDataId(r1, i) => Self::LoadDataId(update_reg(reg_to_reg_map, r1), i.clone()),
             AddrDataId(r1, i) => Self::AddrDataId(update_reg(reg_to_reg_map, r1), i.clone()),
             Undefined => Self::Undefined,
@@ -1750,7 +1750,7 @@ impl VirtualOp {
             /* Non-VM Instructions */
             BLOB(imm) => AllocatedOpcode::BLOB(imm.clone()),
             DataSectionOffsetPlaceholder => AllocatedOpcode::DataSectionOffsetPlaceholder,
-            Metadata => AllocatedOpcode::ConfigurablesOffsetPlaceholder,
+            ConfigurablesOffsetPlaceholder => AllocatedOpcode::ConfigurablesOffsetPlaceholder,
             LoadDataId(reg1, label) => {
                 AllocatedOpcode::LoadDataId(map_reg(&mapping, reg1), label.clone())
             }

From e9f1d5e8557730a182bde23462160f86e0791d12 Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Thu, 24 Oct 2024 08:35:16 +0530
Subject: [PATCH 37/38] another minor fix

---
 sway-core/src/asm_lang/allocated_ops.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sway-core/src/asm_lang/allocated_ops.rs b/sway-core/src/asm_lang/allocated_ops.rs
index 7f79caec9e7..31220a0900d 100644
--- a/sway-core/src/asm_lang/allocated_ops.rs
+++ b/sway-core/src/asm_lang/allocated_ops.rs
@@ -526,7 +526,10 @@ impl fmt::Display for AllocatedOpcode {
 
             /* Non-VM Instructions */
             BLOB(a) => write!(fmtr, "blob {a}"),
-            ConfigurablesOffsetPlaceholder => write!(fmtr, "Metadata"),
+            ConfigurablesOffsetPlaceholder => write!(
+                fmtr,
+                "CONFIGURABLES_OFFSET[0..32]\nCONFIGURABLES_OFFSET[32..64]"
+            ),
             DataSectionOffsetPlaceholder => {
                 write!(
                     fmtr,

From 56e89587b383dd0584553ab66d238ac772e0d25a Mon Sep 17 00:00:00 2001
From: Vaivaswatha Nagaraj <vaivaswatha.nagaraj@fuel.sh>
Date: Tue, 29 Oct 2024 06:46:19 +0530
Subject: [PATCH 38/38] add comment indentation to make clippy happy

---
 .../asm_generation/fuel/programs/abstract.rs   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sway-core/src/asm_generation/fuel/programs/abstract.rs b/sway-core/src/asm_generation/fuel/programs/abstract.rs
index f0d3ef949a1..da1c7cf9fc0 100644
--- a/sway-core/src/asm_generation/fuel/programs/abstract.rs
+++ b/sway-core/src/asm_generation/fuel/programs/abstract.rs
@@ -164,15 +164,15 @@ impl AbstractProgram {
     /// Right now, it looks like this:
     ///
     /// WORD OP
-    /// 1    MOV $scratch $pc
-    /// -    JMPF $zero i10
-    /// 2    DATA_START (0-32) (in bytes, offset from $is)
-    /// -    DATA_START (32-64)
-    /// 3    CONFIGURABLES_OFFSET (0-32)
-    /// -    CONFIGURABLES_OFFSET (32-64)
-    /// 4    LW $ds $scratch 1
-    /// -    ADD $ds $ds $scratch
-    /// 5    .program_start:
+    ///     1    MOV $scratch $pc
+    ///     -    JMPF $zero i10
+    ///     2    DATA_START (0-32) (in bytes, offset from $is)
+    ///     -    DATA_START (32-64)
+    ///     3    CONFIGURABLES_OFFSET (0-32)
+    ///     -    CONFIGURABLES_OFFSET (32-64)
+    ///     4    LW $ds $scratch 1
+    ///     -    ADD $ds $ds $scratch
+    ///     5    .program_start:
     fn build_prologue(&mut self) -> AllocatedAbstractInstructionSet {
         const _: () = assert!(
             crate::PRELUDE_CONFIGURABLES_OFFSET_IN_BYTES == 16,