feat: expose offsets_with_data on configurables (#1685)

- Expose offsets_with_data on Configurables this allows for better DX
when interacting with the Standard SRC12 that requires configurable to
be provided as `Vec<(u64, Vec<u8>)>`.

Note: I have made `offsets_with_data` public and also implement `Into`.
I'm not sure what is the best solution here, so once reviewed it can be
decided how to procede.

Ex.: 

/// Current way to implement:
```rs
// For this two info requires manual change or reading the JSON
const PROXY_ORACLE_ID_OFFSET: u64 = 38488;
const PROXY_OWNER_OFFSET: u64 = 38440;

pub fn build_trade_account_proxy_configurables(
    oracle_id: ContractId,
    owner: Identity,
) -> Vec<(u64, Vec<u8>)> {
    let mut my_configurables: Vec<(u64, Vec<u8>)> = Vec::with_capacity(2);

    my_configurables.push((PROXY_ORACLE_ID_OFFSET, oracle_id.to_vec()));

    let mut owner_data: Vec<u8> = Vec::new();
    owner_data.extend_from_slice(&[0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8]); // State::Initialized
    match owner {
        Identity::Address(address) => {
            owner_data.extend_from_slice(&[0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8]); // Identity::Address
            owner_data.extend_from_slice(&*address.to_vec());
        }
        Identity::ContractId(contract_id) => {
            owner_data.extend_from_slice(&[0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8]); // Identity::ContractId
            owner_data.extend_from_slice(&*contract_id.to_vec());
        }
    }
    my_configurables.push((PROXY_OWNER_OFFSET, owner_data));

    my_configurables
}
```

/// With the changes
```rs
pub fn build_trade_account_proxy_configurables(
    oracle_id: ContractId,
    owner: Identity,
) -> Vec<(u64, Vec<u8>)> {
    TradingAccountProxyConfigurables::default()
        .with_ORACLE_CONTRACT_ID(oracle_id)
        .unwrap()
        .with_INITIAL_OWNER(State::Initialized(owner))
        .unwrap()
        .into()
}
```

The standard implementation is defined as:
```sway
impl SRC12 for Contract {
    #[storage(read, write)]
    fn register_contract(
        child_contract: ContractId,
        configurables: Option<Vec<(u64, Vec<u8>)>>,
    ) -> Result<BytecodeRoot, str> {
```

---------

Co-authored-by: green <[email protected]>

Author: luizstacio

docs/src/codec/index.md

@@ -12,8 +12,8 @@ All types generated by the [`abigen!`](../abigen/index.md) macro implement both
 
 `fuels` also contains implementations for:
 
-- [`Tokenizable`](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html) for the `fuels`-owned types listed [here](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html#implementors) as well as [for some foreign types](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html#foreign-impls) (such as `u8`, `u16`, `std::vec::Vec<T: Tokenizable>`, etc.).
-- [`Parameterize`](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html) for the `fuels`-owned types listed [here](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html#implementors) as well as [for some foreign types](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html#foreign-impls) (such as `u8`, `u16`, `std::vec::Vec<T: Parameterize>`, etc.).
+- [`Tokenizable`](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html) for the `fuels`-owned types listed [here](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html#implementers) as well as [for some foreign types](https://docs.rs/fuels/latest/fuels/core/traits/trait.Tokenizable.html#foreign-impls) (such as `u8`, `u16`, `std::vec::Vec<T: Tokenizable>`, etc.).
+- [`Parameterize`](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html) for the `fuels`-owned types listed [here](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html#implementers) as well as [for some foreign types](https://docs.rs/fuels/latest/fuels/core/traits/trait.Parameterize.html#foreign-impls) (such as `u8`, `u16`, `std::vec::Vec<T: Parameterize>`, etc.).
 
 ## Deriving the traits
 

packages/fuels-code-gen/src/program_bindings/abigen/configurables.rs

@@ -50,7 +50,7 @@ fn generate_struct_decl(configurable_struct_name: &Ident) -> TokenStream {
     quote! {
         #[derive(Clone, Debug, Default)]
         pub struct #configurable_struct_name {
-            offsets_with_data: ::std::vec::Vec<(u64, ::std::vec::Vec<u8>)>,
+            offsets_with_data: ::std::vec::Vec<::fuels::core::Configurable>,
             encoder: ::fuels::core::codec::ABIEncoder,
         }
     }
@@ -89,7 +89,10 @@ fn generate_builder_methods(resolved_configurables: &[ResolvedConfigurable]) ->
                 // Generate the `with_XXX` methods for setting the configurables
                 pub fn #name(mut self, value: #ttype) -> ::fuels::prelude::Result<Self> {
                     let encoded = #encoder_code?;
-                    self.offsets_with_data.push((#offset, encoded));
+                    self.offsets_with_data.push(::fuels::core::Configurable {
+                        offset: #offset,
+                        data: encoded,
+                    });
                     ::fuels::prelude::Result::Ok(self)
                 }
             }
@@ -116,5 +119,10 @@ fn generate_from_impl(configurable_struct_name: &Ident) -> TokenStream {
                 ::fuels::core::Configurables::new(config.offsets_with_data)
             }
         }
+        impl From<#configurable_struct_name> for ::std::vec::Vec<::fuels::core::Configurable> {
+            fn from(config: #configurable_struct_name) -> ::std::vec::Vec<::fuels::core::Configurable> {
+                config.offsets_with_data
+            }
+        }
     }
 }

packages/fuels-core/src/lib.rs

@@ -7,35 +7,47 @@ pub use utils::*;
 
 use crate::types::errors::Result;
 
+#[derive(Debug, Clone, Default, PartialEq)]
+pub struct Configurable {
+    /// The offset (in bytes) within the binary where the data is located.
+    pub offset: u64,
+    /// The data related to the configurable.
+    pub data: Vec<u8>,
+}
+
 #[derive(Debug, Clone, Default, PartialEq)]
 pub struct Configurables {
-    offsets_with_data: Vec<(u64, Vec<u8>)>,
+    pub offsets_with_data: Vec<Configurable>,
 }
 
 impl Configurables {
-    pub fn new(offsets_with_data: Vec<(u64, Vec<u8>)>) -> Self {
+    pub fn new(offsets_with_data: Vec<Configurable>) -> Self {
         Self { offsets_with_data }
     }
 
     pub fn with_shifted_offsets(self, shift: i64) -> Result<Self> {
         let new_offsets_with_data = self
             .offsets_with_data
             .into_iter()
-            .map(|(offset, data)| {
+            .map(|c| {
                 let new_offset = if shift.is_negative() {
-                    offset.checked_sub(shift.unsigned_abs())
+                    c.offset.checked_sub(shift.unsigned_abs())
                 } else {
-                    offset.checked_add(shift.unsigned_abs())
+                    c.offset.checked_add(shift.unsigned_abs())
                 };
 
                 let new_offset = new_offset.ok_or_else(|| {
                     crate::error!(
                         Other,
-                        "Overflow occurred while shifting offset: {offset} + {shift}"
+                        "Overflow occurred while shifting offset: {} + {shift}",
+                        c.offset
                     )
                 })?;
 
-                Ok((new_offset, data.clone()))
+                Ok(Configurable {
+                    offset: new_offset,
+                    data: c.data,
+                })
             })
             .collect::<Result<Vec<_>>>()?;
 
@@ -45,23 +57,35 @@ impl Configurables {
     }
 
     pub fn update_constants_in(&self, binary: &mut [u8]) {
-        for (offset, data) in &self.offsets_with_data {
-            let offset = *offset as usize;
-            binary[offset..offset + data.len()].copy_from_slice(data)
+        for c in &self.offsets_with_data {
+            let offset = c.offset as usize;
+            binary[offset..offset + c.data.len()].copy_from_slice(&c.data)
         }
     }
 }
 
+impl From<Configurables> for Vec<Configurable> {
+    fn from(config: Configurables) -> Vec<Configurable> {
+        config.offsets_with_data.clone()
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
     #[test]
     fn test_with_shifted_offsets_positive_shift() {
-        let offsets_with_data = vec![(10u64, vec![1, 2, 3])];
+        let offsets_with_data = vec![Configurable {
+            offset: 10u64,
+            data: vec![1, 2, 3],
+        }];
         let configurables = Configurables::new(offsets_with_data.clone());
         let shifted_configurables = configurables.with_shifted_offsets(5).unwrap();
-        let expected_offsets_with_data = vec![(15u64, vec![1, 2, 3])];
+        let expected_offsets_with_data = vec![Configurable {
+            offset: 15u64,
+            data: vec![1, 2, 3],
+        }];
         assert_eq!(
             shifted_configurables.offsets_with_data,
             expected_offsets_with_data
@@ -70,10 +94,16 @@ mod tests {
 
     #[test]
     fn test_with_shifted_offsets_negative_shift() {
-        let offsets_with_data = vec![(10u64, vec![4, 5, 6])];
+        let offsets_with_data = vec![Configurable {
+            offset: 10u64,
+            data: vec![4, 5, 6],
+        }];
         let configurables = Configurables::new(offsets_with_data.clone());
         let shifted_configurables = configurables.with_shifted_offsets(-5).unwrap();
-        let expected_offsets_with_data = vec![(5u64, vec![4, 5, 6])];
+        let expected_offsets_with_data = vec![Configurable {
+            offset: 5u64,
+            data: vec![4, 5, 6],
+        }];
         assert_eq!(
             shifted_configurables.offsets_with_data,
             expected_offsets_with_data
@@ -82,7 +112,10 @@ mod tests {
 
     #[test]
     fn test_with_shifted_offsets_zero_shift() {
-        let offsets_with_data = vec![(20u64, vec![7, 8, 9])];
+        let offsets_with_data = vec![Configurable {
+            offset: 20u64,
+            data: vec![7, 8, 9],
+        }];
         let configurables = Configurables::new(offsets_with_data.clone());
         let shifted_configurables = configurables.with_shifted_offsets(0).unwrap();
         let expected_offsets_with_data = offsets_with_data;
@@ -94,7 +127,10 @@ mod tests {
 
     #[test]
     fn test_with_shifted_offsets_overflow() {
-        let offsets_with_data = vec![(u64::MAX - 1, vec![1, 2, 3])];
+        let offsets_with_data = vec![Configurable {
+            offset: u64::MAX - 1,
+            data: vec![1, 2, 3],
+        }];
         let configurables = Configurables::new(offsets_with_data);
         let result = configurables.with_shifted_offsets(10);
         assert!(result.is_err());
@@ -108,7 +144,10 @@ mod tests {
 
     #[test]
     fn test_with_shifted_offsets_underflow() {
-        let offsets_with_data = vec![(5, vec![4, 5, 6])];
+        let offsets_with_data = vec![Configurable {
+            offset: 5u64,
+            data: vec![4, 5, 6],
+        }];
         let configurables = Configurables::new(offsets_with_data);
         let result = configurables.with_shifted_offsets(-10);
         assert!(result.is_err());

packages/fuels-programs/src/executable.rs

@@ -213,7 +213,7 @@ fn validate_loader_can_be_made_from_code(
 mod tests {
     use std::io::Write;
 
-    use fuels_core::Configurables;
+    use fuels_core::{Configurable, Configurables};
     use tempfile::NamedTempFile;
 
     use super::*;
@@ -272,7 +272,10 @@ mod tests {
         // Given: An Executable<Regular> and some configurables
         let code = vec![1u8, 2, 3, 4];
         let executable = Executable::<Regular>::from_bytes(code);
-        let configurables = Configurables::new(vec![(2, vec![1])]);
+        let configurables = Configurables::new(vec![Configurable {
+            offset: 2,
+            data: vec![1],
+        }]);
 
         // When: Setting new configurables
         let new_executable = executable.with_configurables(configurables.clone());
@@ -285,7 +288,10 @@ mod tests {
     fn test_executable_regular_code() {
         // Given: An Executable<Regular> with some code and configurables
         let code = vec![1u8, 2, 3, 4];
-        let configurables = Configurables::new(vec![(1, vec![1])]);
+        let configurables = Configurables::new(vec![Configurable {
+            offset: 1,
+            data: vec![1],
+        }]);
         let executable =
             Executable::<Regular>::from_bytes(code.clone()).with_configurables(configurables);
 

packages/fuels-test-helpers/src/service.rs

@@ -1,10 +1,9 @@
-use std::net::SocketAddr;
-
 #[cfg(feature = "fuel-core-lib")]
 use fuel_core::service::{Config as ServiceConfig, FuelService as CoreFuelService};
 use fuel_core_chain_config::{ChainConfig, StateConfig};
 use fuel_core_services::State;
 use fuels_core::types::errors::{Result, error};
+use std::net::SocketAddr;
 
 use crate::NodeConfig;
 #[cfg(not(feature = "fuel-core-lib"))]
@@ -90,7 +89,8 @@ impl FuelService {
                 columns_policy: ColumnsPolicy::Lazy,
             },
             #[cfg(feature = "rocksdb")]
-            state_rewind_policy: Default::default(),
+            state_rewind_policy:
+                fuel_core::state::historical_rocksdb::StateRewindPolicy::RewindFullRange,
         };
 
         ServiceConfig {

packages/fuels/src/lib.rs

@@ -38,7 +38,7 @@ pub mod programs {
 }
 
 pub mod core {
-    pub use fuels_core::{Configurables, codec, constants, offsets, traits};
+    pub use fuels_core::{Configurable, Configurables, codec, constants, offsets, traits};
 }
 
 pub mod crypto {