From 420fc989da08b683bc57db5fef055e3c50677149 Mon Sep 17 00:00:00 2001
From: bitzoic <bitzoic.eth@gmail.com>
Date: Thu, 23 Jan 2025 10:25:49 +0100
Subject: [PATCH 1/4] Update to use forc v0.66.6

---
 .github/workflows/ci.yaml | 4 ++--
 README.md                 | 6 +++---
 docs/src/index.md         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4087010..35869a3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,8 +16,8 @@ env:
   CARGO_TERM_COLOR: always
   REGISTRY: ghcr.io
   RUST_VERSION: 1.80.1
-  FORC_VERSION: 0.63.3
-  CORE_VERSION: 0.34.0
+  FORC_VERSION: 0.66.6
+  CORE_VERSION: 0.40.0
   PATH_TO_SCRIPTS: .github/scripts
 
 jobs:
diff --git a/README.md b/README.md
index 57ec3b3..c4940a0 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@
     <a href="https://github.com/FuelLabs/sway-standards/actions/workflows/ci.yaml" alt="CI">
         <img src="https://github.com/FuelLabs/sway-standards/actions/workflows/ci.yaml/badge.svg" />
     </a>
-    <a href="https://crates.io/crates/forc/0.63.3" alt="forc">
-        <img src="https://img.shields.io/badge/forc-v0.63.3-orange" />
+    <a href="https://crates.io/crates/forc/0.66.6" alt="forc">
+        <img src="https://img.shields.io/badge/forc-v0.66.6-orange" />
     </a>
     <a href="./LICENSE" alt="forc">
         <img src="https://img.shields.io/github/license/FuelLabs/sway-standards" />
@@ -163,7 +163,7 @@ Example of a minimal SRC-14 implementation with no access control.
 Example of a SRC-14 implementation that also implements [SRC-5](https://docs.fuel.network/docs/sway-standards/src-5-ownership/).
 
 > **Note**
-> All standards currently use `forc v0.63.3`.
+> All standards currently use `forc v0.66.6`.
 
 <!-- TODO:
 ## Contributing
diff --git a/docs/src/index.md b/docs/src/index.md
index 5f3d3b5..f6db509 100644
--- a/docs/src/index.md
+++ b/docs/src/index.md
@@ -7,7 +7,7 @@ Standards in this repository may be in various stages of development. Use of dra
 If you don't find what you're looking for, feel free to create an issue and propose a new standard!
 
 > **Note**
-> All standards currently use `forc v0.63.3`.
+> All standards currently use `forc v0.66.6`.
 
 ## Using a standard
 

From 2def8e8e1f362358868e03841e612eb42406dff8 Mon Sep 17 00:00:00 2001
From: bitzoic <bitzoic.eth@gmail.com>
Date: Thu, 23 Jan 2025 10:29:48 +0100
Subject: [PATCH 2/4] Update CHANGELOG

---
 CHANGELOG.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b1d2ae..bc6f09b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### New Standards
+
+- [#161](https://github.com/FuelLabs/sway-standards/pull/161) Defines the SRC-16; Typed Structured Data Standard.
+
 ### Added
 
 - Something new here 1
@@ -14,8 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
-- Something changed here 1
-- Something changed here 2
+- [#166](https://github.com/FuelLabs/sway-standards/pull/166) Updates standards, examples, and CI to forc `v0.66.6` and fuel-core `v0.40.0`.
 
 ### Fixed
 

From 10d90f97e2b82cf0e121aa99cc6d3d474b573d04 Mon Sep 17 00:00:00 2001
From: bitzoic <bitzoic.eth@gmail.com>
Date: Fri, 24 Jan 2025 12:10:20 +0100
Subject: [PATCH 3/4] Run formatter

---
 .../hardcoded-information/src/main.sw         |   2 +-
 .../variable-information/src/main.sw          |   2 +-
 .../with_configurables/src/utils.sw           |   2 +-
 .../src/with_configurables.sw                 |   2 +-
 .../src/without_configurables.sw              |   2 +-
 examples/src16-typed-data/Forc.toml           |   5 +-
 .../ethereum_example/Forc.toml                |   2 +-
 .../ethereum_example/src/main.sw              |  66 ++------
 .../src16-typed-data/fuel_example/Forc.toml   |   2 +-
 .../src16-typed-data/fuel_example/src/main.sw |  61 ++-----
 .../multi_asset/src/multi_asset.sw            |   2 +-
 .../single_asset/src/single_asset.sw          |   2 +-
 standards/src/src16.sw                        | 154 ++++++++----------
 13 files changed, 111 insertions(+), 193 deletions(-)

diff --git a/examples/src11-security-information/hardcoded-information/src/main.sw b/examples/src11-security-information/hardcoded-information/src/main.sw
index fcabcae..b82210b 100644
--- a/examples/src11-security-information/hardcoded-information/src/main.sw
+++ b/examples/src11-security-information/hardcoded-information/src/main.sw
@@ -2,7 +2,7 @@ contract;
 
 use standards::src11::{SecurityInformation, SRC11};
 
-use std::{string::String, vec::Vec,};
+use std::{string::String, vec::Vec};
 
 /// The name of the project
 const NAME: str[7] = __to_str_array("Example");
diff --git a/examples/src11-security-information/variable-information/src/main.sw b/examples/src11-security-information/variable-information/src/main.sw
index b2d3f88..b0bda05 100644
--- a/examples/src11-security-information/variable-information/src/main.sw
+++ b/examples/src11-security-information/variable-information/src/main.sw
@@ -2,7 +2,7 @@ contract;
 
 use standards::src11::{SecurityInformation, SRC11};
 
-use std::{storage::{storage_string::*, storage_vec::*,}, string::String, vec::Vec,};
+use std::{storage::{storage_string::*, storage_vec::*}, string::String, vec::Vec};
 
 /// The name of the project
 const NAME: str[7] = __to_str_array("Example");
diff --git a/examples/src12-contract-factory/with_configurables/src/utils.sw b/examples/src12-contract-factory/with_configurables/src/utils.sw
index 4029d77..42e1ea9 100644
--- a/examples/src12-contract-factory/with_configurables/src/utils.sw
+++ b/examples/src12-contract-factory/with_configurables/src/utils.sw
@@ -1,6 +1,6 @@
 library;
 
-use std::{alloc::{alloc, alloc_bytes, realloc_bytes}, bytes::Bytes,};
+use std::{alloc::{alloc, alloc_bytes, realloc_bytes}, bytes::Bytes};
 
 /// Pre-defined number of bytes of a leaf in a bytecode merkle tree.
 const LEAF_SIZE = 16 * 1024;
diff --git a/examples/src12-contract-factory/with_configurables/src/with_configurables.sw b/examples/src12-contract-factory/with_configurables/src/with_configurables.sw
index a867b80..949c55a 100644
--- a/examples/src12-contract-factory/with_configurables/src/with_configurables.sw
+++ b/examples/src12-contract-factory/with_configurables/src/with_configurables.sw
@@ -4,7 +4,7 @@ mod utils;
 
 use utils::{_compute_bytecode_root, _swap_configurables};
 use standards::src12::*;
-use std::{external::bytecode_root, hash::{Hash, sha256,}, storage::storage_vec::*,};
+use std::{external::bytecode_root, hash::{Hash, sha256}, storage::storage_vec::*};
 
 configurable {
     TEMPLATE_BYTECODE_ROOT: b256 = b256::zero(),
diff --git a/examples/src12-contract-factory/without_configurables/src/without_configurables.sw b/examples/src12-contract-factory/without_configurables/src/without_configurables.sw
index a30de7f..7182dae 100644
--- a/examples/src12-contract-factory/without_configurables/src/without_configurables.sw
+++ b/examples/src12-contract-factory/without_configurables/src/without_configurables.sw
@@ -1,7 +1,7 @@
 contract;
 
 use standards::src12::*;
-use std::{external::bytecode_root, hash::Hash,};
+use std::{external::bytecode_root, hash::Hash};
 
 configurable {
     TEMPLATE_BYTECODE_ROOT: b256 = b256::zero(),
diff --git a/examples/src16-typed-data/Forc.toml b/examples/src16-typed-data/Forc.toml
index 311d022..0193e1b 100644
--- a/examples/src16-typed-data/Forc.toml
+++ b/examples/src16-typed-data/Forc.toml
@@ -1,5 +1,2 @@
 [workspace]
-members = [
-  "fuel_example",
-  "ethereum_example",
-]
\ No newline at end of file
+members = ["fuel_example", "ethereum_example"]
diff --git a/examples/src16-typed-data/ethereum_example/Forc.toml b/examples/src16-typed-data/ethereum_example/Forc.toml
index d2ff821..4dd24b0 100644
--- a/examples/src16-typed-data/ethereum_example/Forc.toml
+++ b/examples/src16-typed-data/ethereum_example/Forc.toml
@@ -5,4 +5,4 @@ license = "Apache-2.0"
 name = "src16_ethereum_typed_data"
 
 [dependencies]
-standards = { path = "../../../standards" }
\ No newline at end of file
+standards = { path = "../../../standards" }
diff --git a/examples/src16-typed-data/ethereum_example/src/main.sw b/examples/src16-typed-data/ethereum_example/src/main.sw
index c20412b..cc5f1ca 100644
--- a/examples/src16-typed-data/ethereum_example/src/main.sw
+++ b/examples/src16-typed-data/ethereum_example/src/main.sw
@@ -1,22 +1,16 @@
 contract;
 
 use standards::src16::{
-    SRC16Base,
+    DataEncoder,
+    DomainHash,
     EIP712,
     EIP712Domain,
-    DomainHash,
-    TypedDataHash,
-    DataEncoder,
-    SRC16Payload,
+    SRC16Base,
     SRC16Encode,
+    SRC16Payload,
+    TypedDataHash,
 };
-use std::{
-    bytes::Bytes,
-    string::String,
-    hash::*,
-    contract_id::*,
-};
-
+use std::{bytes::Bytes, contract_id::*, hash::*, string::String};
 
 configurable {
     /// The name of the signing domain.
@@ -27,7 +21,6 @@ configurable {
     CHAIN_ID: u64 = 9889u64,
 }
 
-
 /// A demo struct representing a mail message
 pub struct Mail {
     /// The sender's address
@@ -47,7 +40,6 @@ pub struct Mail {
 const MAIL_TYPE_HASH: b256 = 0xcfc972d321844e0304c5a752957425d5df13c3b09c563624a806b517155d7056;
 
 impl TypedDataHash for Mail {
-
     fn type_hash() -> b256 {
         MAIL_TYPE_HASH
     }
@@ -56,19 +48,11 @@ impl TypedDataHash for Mail {
         let mut encoded = Bytes::new();
 
         // Add the Mail type hash.
-        encoded.append(
-            MAIL_TYPE_HASH.to_be_bytes()
-        );
+        encoded.append(MAIL_TYPE_HASH.to_be_bytes());
         // Use the DataEncoder to encode each field for known types
-        encoded.append(
-            DataEncoder::encode_b256(self.from).to_be_bytes()
-        );
-        encoded.append(
-            DataEncoder::encode_b256(self.to).to_be_bytes()
-        );
-        encoded.append(
-            DataEncoder::encode_string(self.contents).to_be_bytes()
-        );
+        encoded.append(DataEncoder::encode_b256(self.from).to_be_bytes());
+        encoded.append(DataEncoder::encode_b256(self.to).to_be_bytes());
+        encoded.append(DataEncoder::encode_string(self.contents).to_be_bytes());
 
         keccak256(encoded)
     }
@@ -86,9 +70,7 @@ impl TypedDataHash for Mail {
 ///    SRC16Payload::encode_hash()
 ///
 impl SRC16Encode<Mail> for Mail {
-
     fn encode(s: Mail) -> b256 {
-
         // encodeData hash
         let data_hash = s.struct_hash();
         // setup payload
@@ -105,9 +87,7 @@ impl SRC16Encode<Mail> for Mail {
     }
 }
 
-
 impl SRC16Base for Contract {
-
     fn domain_separator_hash() -> b256 {
         _get_domain_separator().domain_hash()
     }
@@ -118,24 +98,16 @@ impl SRC16Base for Contract {
 }
 
 impl EIP712 for Contract {
-
     fn domain_separator() -> EIP712Domain {
         _get_domain_separator()
     }
-
 }
 
-
 abi MailMe {
-    fn send_mail_get_hash(
-        from_addr: b256,
-        to_addr: b256,
-        contents: String,
-    ) -> b256;
+    fn send_mail_get_hash(from_addr: b256, to_addr: b256, contents: String) -> b256;
 }
 
 impl MailMe for Contract {
-
     /// Sends a some mail and returns its encoded hash
     ///
     /// # Arguments
@@ -148,11 +120,7 @@ impl MailMe for Contract {
     ///
     /// * [b256] - The encoded hash of the mail data
     ///
-    fn send_mail_get_hash(
-        from_addr: b256,
-        to_addr: b256,
-        contents: String,
-    ) -> b256 {
+    fn send_mail_get_hash(from_addr: b256, to_addr: b256, contents: String) -> b256 {
         // Create the mail struct from data passed in call
         let some_mail = Mail {
             from: from_addr,
@@ -162,7 +130,6 @@ impl MailMe for Contract {
 
         Mail::encode(some_mail)
     }
-
 }
 
 /// A program specific implementation to get the Ethereum EIP712Domain
@@ -177,10 +144,9 @@ fn _get_domain_separator() -> EIP712Domain {
     EIP712Domain::new(
         String::from_ascii_str(from_str_array(DOMAIN)),
         String::from_ascii_str(from_str_array(VERSION)),
-        (asm(r1: (0, 0, 0, CHAIN_ID)) { r1: u256 }),
-        ContractId::this()
+        (asm(r1: (0, 0, 0, CHAIN_ID)) {
+                r1: u256
+            }),
+        ContractId::this(),
     )
 }
-
-
-
diff --git a/examples/src16-typed-data/fuel_example/Forc.toml b/examples/src16-typed-data/fuel_example/Forc.toml
index 40aa2e7..d05077a 100644
--- a/examples/src16-typed-data/fuel_example/Forc.toml
+++ b/examples/src16-typed-data/fuel_example/Forc.toml
@@ -5,4 +5,4 @@ license = "Apache-2.0"
 name = "src16_fuel_typed_data"
 
 [dependencies]
-standards = { path = "../../../standards" }
\ No newline at end of file
+standards = { path = "../../../standards" }
diff --git a/examples/src16-typed-data/fuel_example/src/main.sw b/examples/src16-typed-data/fuel_example/src/main.sw
index 2fb4d74..b2c9d33 100644
--- a/examples/src16-typed-data/fuel_example/src/main.sw
+++ b/examples/src16-typed-data/fuel_example/src/main.sw
@@ -1,22 +1,16 @@
 contract;
 
 use standards::src16::{
-    SRC16Base,
+    DataEncoder,
+    DomainHash,
     SRC16,
+    SRC16Base,
     SRC16Domain,
-    DomainHash,
-    TypedDataHash,
-    DataEncoder,
-    SRC16Payload,
     SRC16Encode,
+    SRC16Payload,
+    TypedDataHash,
 };
-use std::{
-    bytes::Bytes,
-    string::String,
-    hash::*,
-    contract_id::*,
-};
-
+use std::{bytes::Bytes, contract_id::*, hash::*, string::String};
 
 configurable {
     /// The name of the signing domain.
@@ -27,7 +21,6 @@ configurable {
     CHAIN_ID: u64 = 9889u64,
 }
 
-
 /// A demo struct representing a mail message
 pub struct Mail {
     /// The sender's address
@@ -47,7 +40,6 @@ pub struct Mail {
 const MAIL_TYPE_HASH: b256 = 0x536e54c54e6699204b424f41f6dea846ee38ac369afec3e7c141d2c92c65e67f;
 
 impl TypedDataHash for Mail {
-
     fn type_hash() -> b256 {
         MAIL_TYPE_HASH
     }
@@ -55,19 +47,11 @@ impl TypedDataHash for Mail {
     fn struct_hash(self) -> b256 {
         let mut encoded = Bytes::new();
         // Add the Mail type hash.
-        encoded.append(
-            MAIL_TYPE_HASH.to_be_bytes()
-        );
+        encoded.append(MAIL_TYPE_HASH.to_be_bytes());
         // Use the DataEncoder to encode each field for known types
-        encoded.append(
-            DataEncoder::encode_address(self.from).to_be_bytes()
-        );
-        encoded.append(
-            DataEncoder::encode_address(self.to).to_be_bytes()
-        );
-        encoded.append(
-            DataEncoder::encode_string(self.contents).to_be_bytes()
-        );
+        encoded.append(DataEncoder::encode_address(self.from).to_be_bytes());
+        encoded.append(DataEncoder::encode_address(self.to).to_be_bytes());
+        encoded.append(DataEncoder::encode_string(self.contents).to_be_bytes());
 
         keccak256(encoded)
     }
@@ -85,9 +69,7 @@ impl TypedDataHash for Mail {
 ///    SRC16Payload::encode_hash()
 ///
 impl SRC16Encode<Mail> for Mail {
-
     fn encode(s: Mail) -> b256 {
-
         // encodeData hash
         let data_hash = s.struct_hash();
         // setup payload
@@ -104,9 +86,7 @@ impl SRC16Encode<Mail> for Mail {
     }
 }
 
-
 impl SRC16Base for Contract {
-
     fn domain_separator_hash() -> b256 {
         _get_domain_separator().domain_hash()
     }
@@ -117,24 +97,16 @@ impl SRC16Base for Contract {
 }
 
 impl SRC16 for Contract {
-
     fn domain_separator() -> SRC16Domain {
         _get_domain_separator()
     }
-
 }
 
-
 abi MailMe {
-    fn send_mail_get_hash(
-        from_addr: Address,
-        to_addr: Address,
-        contents: String,
-    ) -> b256;
+    fn send_mail_get_hash(from_addr: Address, to_addr: Address, contents: String) -> b256;
 }
 
 impl MailMe for Contract {
-
     /// Sends a some mail and returns its encoded hash
     ///
     /// # Arguments
@@ -147,11 +119,7 @@ impl MailMe for Contract {
     ///
     /// * [b256] - The encoded hash of the mail data
     ///
-    fn send_mail_get_hash(
-        from_addr: Address,
-        to_addr: Address,
-        contents: String,
-    ) -> b256 {
+    fn send_mail_get_hash(from_addr: Address, to_addr: Address, contents: String) -> b256 {
         // Create the mail struct from data passed in call
         let some_mail = Mail {
             from: from_addr,
@@ -161,7 +129,6 @@ impl MailMe for Contract {
 
         Mail::encode(some_mail)
     }
-
 }
 
 /// A program specific implementation to get the Fuel SRC16Domain
@@ -177,8 +144,6 @@ fn _get_domain_separator() -> SRC16Domain {
         String::from_ascii_str(from_str_array(DOMAIN)),
         String::from_ascii_str(from_str_array(VERSION)),
         CHAIN_ID,
-        ContractId::this()
+        ContractId::this(),
     )
 }
-
-
diff --git a/examples/src20-native-asset/multi_asset/src/multi_asset.sw b/examples/src20-native-asset/multi_asset/src/multi_asset.sw
index 0fec714..dd5a6b5 100644
--- a/examples/src20-native-asset/multi_asset/src/multi_asset.sw
+++ b/examples/src20-native-asset/multi_asset/src/multi_asset.sw
@@ -1,6 +1,6 @@
 contract;
 
-use standards::src20::{SetDecimalsEvent, SetNameEvent, SetSymbolEvent, SRC20, TotalSupplyEvent,};
+use standards::src20::{SetDecimalsEvent, SetNameEvent, SetSymbolEvent, SRC20, TotalSupplyEvent};
 use std::{hash::Hash, storage::storage_string::*, string::String};
 
 storage {
diff --git a/examples/src20-native-asset/single_asset/src/single_asset.sw b/examples/src20-native-asset/single_asset/src/single_asset.sw
index f06089a..73d6d93 100644
--- a/examples/src20-native-asset/single_asset/src/single_asset.sw
+++ b/examples/src20-native-asset/single_asset/src/single_asset.sw
@@ -1,6 +1,6 @@
 contract;
 
-use standards::src20::{SetDecimalsEvent, SetNameEvent, SetSymbolEvent, SRC20, TotalSupplyEvent,};
+use standards::src20::{SetDecimalsEvent, SetNameEvent, SetSymbolEvent, SRC20, TotalSupplyEvent};
 use std::{auth::msg_sender, string::String};
 
 configurable {
diff --git a/standards/src/src16.sw b/standards/src/src16.sw
index c19d2ee..5d51e94 100644
--- a/standards/src/src16.sw
+++ b/standards/src/src16.sw
@@ -1,14 +1,9 @@
 library;
 
-use std::{
-    bytes::Bytes,
-    string::String,
-    hash::*,
-};
+use std::{bytes::Bytes, hash::*, string::String};
 use std::bytes_conversions::{b256::*, u256::*, u64::*};
 use std::core::codec::{AbiEncode, encode};
 
-
 /// This base ABI provides the common hashing functionality that is
 /// shared between the Fuel (SRC16) and Ethereum (EIP712) implementations.
 abi SRC16Base {
@@ -57,7 +52,6 @@ abi EIP712 : SRC16Base {
     fn domain_separator() -> EIP712Domain;
 }
 
-
 /// Contains the core parameters that uniquely identify a domain for typed
 /// data signing on Fuel.
 pub struct SRC16Domain {
@@ -94,14 +88,15 @@ impl AbiEncode for SRC16Domain {
         let buffer = SRC16_DOMAIN_TYPE_HASH.abi_encode(buffer);
         let buffer = keccak256(Bytes::from(self.name)).abi_encode(buffer);
         let buffer = keccak256(Bytes::from(self.version)).abi_encode(buffer);
-        let buffer = (asm(r1: (0, 0, 0, self.chain_id)) { r1: b256 }).abi_encode(buffer);
+        let buffer = (asm(r1: (0, 0, 0, self.chain_id)) {
+            r1: b256
+        }).abi_encode(buffer);
         let buffer = self.verifying_contract.abi_encode(buffer);
         buffer
     }
 }
 
 impl SRC16Domain {
-
     /// Creates a new SRC16Domain instance with the provided parameters
     ///
     /// # Arguments
@@ -144,7 +139,6 @@ impl SRC16Domain {
         let bytes = Bytes::from(encoded);
         keccak256(bytes)
     }
-
 }
 
 /// The EIP712 Domain struct matching Ethereum's implementation
@@ -189,7 +183,6 @@ impl AbiEncode for EIP712Domain {
 }
 
 impl EIP712Domain {
-
     /// Creates a new EIP712Domain instance with the provided parameters
     ///
     /// # Arguments
@@ -209,7 +202,6 @@ impl EIP712Domain {
         chain_id: u256,
         verifying_contract: ContractId,
     ) -> EIP712Domain {
-
         // Take only the rightmost 20 bytes from a 32-byte Fuel ContractId
         let mut verifying_contract_last_20 = Bytes::with_capacity(32);
         let mut i = 0;
@@ -243,14 +235,11 @@ impl EIP712Domain {
         let bytes = Bytes::from(encoded);
         keccak256(bytes)
     }
-
 }
 
-
 /// Trait for types that can be hashed in a structured way
 ///
 pub trait TypedDataHash {
-
     /// The type hash constant for this struct
     fn type_hash() -> b256;
 
@@ -295,7 +284,6 @@ pub struct SRC16Payload<D> {
 }
 
 impl<D> SRC16Payload<D> {
-
     /// Computes the final encoded hash according to SRC16/EIP712 specification
     ///
     /// # Additional Information
@@ -326,7 +314,8 @@ impl<D> SRC16Payload<D> {
     /// }
     /// ```
     pub fn encode_hash(self) -> Option<b256>
-        where D: DomainHash
+    where
+        D: DomainHash,
     {
         let domain_separator_bytes = self.domain.domain_hash().to_be_bytes();
         let data_hash_bytes = self.data_hash.to_be_bytes();
@@ -339,7 +328,6 @@ impl<D> SRC16Payload<D> {
 
         Some(final_hash)
     }
-
 }
 
 /// Trait for domain types that can be hashed
@@ -372,9 +360,7 @@ impl DomainHash for EIP712Domain {
     }
 }
 
-
 pub trait SRC16Encode<T> {
-
     /// Returns the combined typed data hash according to SRC16 specification.
     ///
     /// # Arguments
@@ -399,7 +385,6 @@ pub trait SRC16Encode<T> {
     fn encode<T>(s: T) -> b256;
 }
 
-
 /// This trait provides common encoding methods for different data types.
 ///
 /// # Additional Information
@@ -439,7 +424,6 @@ pub struct DataEncoder {}
 /// specification.
 ///
 impl TypedDataEncoder for DataEncoder {
-
     /// Encodes a String value by taking the Keccak256 hash of its bytes.
     ///
     /// # Arguments
@@ -463,7 +447,9 @@ impl TypedDataEncoder for DataEncoder {
     ///
     /// * [b256] - The value padded to 32 bytes
     fn encode_u8(value: u8) -> b256 {
-        asm(r1: (0, 0, 0, value.as_u64())) { r1: b256 }
+        asm(r1: (0, 0, 0, value.as_u64())) {
+            r1: b256
+        }
     }
 
     /// Encodes a u16 value into a 32-byte value (big-endian, padded with zeros).
@@ -476,7 +462,9 @@ impl TypedDataEncoder for DataEncoder {
     ///
     /// * [b256] - The value padded to 32 bytes
     fn encode_u16(value: u16) -> b256 {
-        asm(r1: (0, 0, 0, value.as_u64())) { r1: b256 }
+        asm(r1: (0, 0, 0, value.as_u64())) {
+            r1: b256
+        }
     }
 
     /// Encodes a u32 value into a 32-byte value (big-endian, padded with zeros).
@@ -489,7 +477,9 @@ impl TypedDataEncoder for DataEncoder {
     ///
     /// * [b256] - The value padded to 32 bytes
     fn encode_u32(value: u32) -> b256 {
-        asm(r1: (0, 0, 0, value.as_u64())) { r1: b256 }
+        asm(r1: (0, 0, 0, value.as_u64())) {
+            r1: b256
+        }
     }
 
     /// Encodes a u64 value into a 32-byte value (big-endian, padded with zeros).
@@ -502,7 +492,9 @@ impl TypedDataEncoder for DataEncoder {
     ///
     /// * [b256] - The value padded to 32 bytes
     fn encode_u64(value: u64) -> b256 {
-        asm(r1: (0, 0, 0, value)) { r1: b256 }
+        asm(r1: (0, 0, 0, value)) {
+            r1: b256
+        }
     }
 
     /// Encodes a u256 value into a 32-byte value (big-endian, padded with zeros).
@@ -548,7 +540,9 @@ impl TypedDataEncoder for DataEncoder {
     /// * [b256] - The encoded value
     fn encode_bool(value: bool) -> b256 {
         let value_as_uint = if value { 1u64 } else { 0u64 };
-        asm(r1: (0, 0, 0, value_as_uint)) { r1: b256 }
+        asm(r1: (0, 0, 0, value_as_uint)) {
+            r1: b256
+        }
     }
 
     /// Encodes a dynamic array of u8 values into a single 32-byte hash.
@@ -571,11 +565,13 @@ impl TypedDataEncoder for DataEncoder {
         let mut encoded = Bytes::new();
         for v in array.iter() {
             encoded.append(
-                (asm(r1: (0, 0, 0, v.as_u64())) { r1: b256 }).to_be_bytes()
+                (asm(r1: (0, 0, 0, v.as_u64())) {
+                        r1: b256
+                    })
+                    .to_be_bytes(),
             );
         }
         keccak256(encoded)
-
     }
 
     /// Encodes a dynamic array of u16 values into a single 32-byte hash.
@@ -598,7 +594,10 @@ impl TypedDataEncoder for DataEncoder {
         let mut encoded = Bytes::new();
         for v in array.iter() {
             encoded.append(
-                (asm(r1: (0, 0, 0, v.as_u64())) { r1: b256 }).to_be_bytes()
+                (asm(r1: (0, 0, 0, v.as_u64())) {
+                        r1: b256
+                    })
+                    .to_be_bytes(),
             );
         }
         keccak256(encoded)
@@ -624,7 +623,10 @@ impl TypedDataEncoder for DataEncoder {
         let mut encoded = Bytes::new();
         for v in array.iter() {
             encoded.append(
-                (asm(r1: (0, 0, 0, v.as_u64())) { r1: b256 }).to_be_bytes()
+                (asm(r1: (0, 0, 0, v.as_u64())) {
+                        r1: b256
+                    })
+                    .to_be_bytes(),
             );
         }
         keccak256(encoded)
@@ -649,9 +651,9 @@ impl TypedDataEncoder for DataEncoder {
     fn dynamic_u64_array(array: Vec<u64>) -> b256 {
         let mut encoded = Bytes::new();
         for v in array.iter() {
-            encoded.append(
-                (asm(r1: (0, 0, 0, v)) { r1: b256 }).to_be_bytes()
-            );
+            encoded.append((asm(r1: (0, 0, 0, v)) {
+                r1: b256
+            }).to_be_bytes());
         }
         keccak256(encoded)
     }
@@ -675,9 +677,7 @@ impl TypedDataEncoder for DataEncoder {
     fn dynamic_u256_array(array: Vec<u256>) -> b256 {
         let mut encoded = Bytes::new();
         for v in array.iter() {
-            encoded.append(
-                v.to_be_bytes()
-            );
+            encoded.append(v.to_be_bytes());
         }
         keccak256(encoded)
     }
@@ -701,9 +701,7 @@ impl TypedDataEncoder for DataEncoder {
     fn dynamic_b256_array(array: Vec<b256>) -> b256 {
         let mut encoded = Bytes::new();
         for v in array.iter() {
-            encoded.append(
-                v.to_be_bytes()
-            );
+            encoded.append(v.to_be_bytes());
         }
         keccak256(encoded)
     }
@@ -753,10 +751,8 @@ impl TypedDataEncoder for DataEncoder {
             Identity::ContractId(contract_id) => contract_id.bits(),
         }
     }
-
 }
 
-
 /// This enum determines the encoder type for fixed-length array encoding.
 pub enum EncoderType {
     String: (),
@@ -768,7 +764,7 @@ pub enum EncoderType {
     B256: (),
     Address: (),
     ContractId: (),
-    Identity: ()
+    Identity: (),
 }
 
 /// This trait provides standard methods for encoding a fixed array of typed
@@ -791,7 +787,6 @@ pub enum EncoderType {
 /// * [b256] - The Keccak256 hash of the concatenated encoded values
 ///
 pub trait FixedDataEncoder {
-
     fn encode_fixed_string_array(slice: raw_slice) -> b256;
     fn encode_fixed_u8_array(slice: raw_slice) -> b256;
     fn encode_fixed_u16_array(slice: raw_slice) -> b256;
@@ -802,11 +797,9 @@ pub trait FixedDataEncoder {
     fn encode_fixed_address_array(slice: raw_slice) -> b256;
     fn encode_fixed_contract_id_array(slice: raw_slice) -> b256;
     fn encode_fixed_identity_array(slice: raw_slice) -> b256;
-
 }
 
 impl FixedDataEncoder for DataEncoder {
-
     /// Encodes a fixed array of String values into a single 32-byte hash.
     fn encode_fixed_string_array(slice: raw_slice) -> b256 {
         let mut encoded = Bytes::new();
@@ -956,47 +949,44 @@ impl FixedDataEncoder for DataEncoder {
         }
         keccak256(encoded)
     }
-
 }
 
-
 /// This trait provides encoding functionality for fixed-length arrays of different types.
 pub trait FixedArrayEncoder {
-   /// Encodes a fixed-length array into a 32-byte hash based on the specified encoder type.
-   ///
-   /// # Additional Information
-   ///
-   /// This function acts as a dispatcher that routes to specific encoding implementations
-   /// based on the provided EncoderType. The encoding follows this scheme:
-   /// 1. Each element is encoded according to its type-specific rules
-   /// 2. The encoded values are concatenated in order
-   /// 3. The concatenated bytes are hashed with Keccak256
-   ///
-   /// # Arguments
-   ///
-   /// * `slice`: [raw_slice] - The raw slice containing the array data
-   /// * `encoder_type`: [EncoderType] - The type of encoder to use for the array elements
-   ///
-   /// # Returns
-   ///
-   /// * [b256] - The Keccak256 hash of the concatenated encoded values
-   fn encode_fixed_array(slice: raw_slice, encoder_type: EncoderType) -> b256;
+    /// Encodes a fixed-length array into a 32-byte hash based on the specified encoder type.
+    ///
+    /// # Additional Information
+    ///
+    /// This function acts as a dispatcher that routes to specific encoding implementations
+    /// based on the provided EncoderType. The encoding follows this scheme:
+    /// 1. Each element is encoded according to its type-specific rules
+    /// 2. The encoded values are concatenated in order
+    /// 3. The concatenated bytes are hashed with Keccak256
+    ///
+    /// # Arguments
+    ///
+    /// * `slice`: [raw_slice] - The raw slice containing the array data
+    /// * `encoder_type`: [EncoderType] - The type of encoder to use for the array elements
+    ///
+    /// # Returns
+    ///
+    /// * [b256] - The Keccak256 hash of the concatenated encoded values
+    fn encode_fixed_array(slice: raw_slice, encoder_type: EncoderType) -> b256;
 }
 
 impl FixedArrayEncoder for DataEncoder {
-
-   fn encode_fixed_array(slice: raw_slice, encoder_type: EncoderType) -> b256 {
-       match encoder_type {
-           EncoderType::String => Self::encode_fixed_string_array(slice),
-           EncoderType::U8 => Self::encode_fixed_u8_array(slice),
-           EncoderType::U16 => Self::encode_fixed_u16_array(slice),
-           EncoderType::U32 => Self::encode_fixed_u32_array(slice),
-           EncoderType::U64 => Self::encode_fixed_u64_array(slice),
-           EncoderType::U256 => Self::encode_fixed_u256_array(slice),
-           EncoderType::B256 => Self::encode_fixed_b256_array(slice),
-           EncoderType::Address => Self::encode_fixed_address_array(slice),
-           EncoderType::ContractId => Self::encode_fixed_contract_id_array(slice),
-           EncoderType::Identity => Self::encode_fixed_identity_array(slice),
-       }
-   }
+    fn encode_fixed_array(slice: raw_slice, encoder_type: EncoderType) -> b256 {
+        match encoder_type {
+            EncoderType::String => Self::encode_fixed_string_array(slice),
+            EncoderType::U8 => Self::encode_fixed_u8_array(slice),
+            EncoderType::U16 => Self::encode_fixed_u16_array(slice),
+            EncoderType::U32 => Self::encode_fixed_u32_array(slice),
+            EncoderType::U64 => Self::encode_fixed_u64_array(slice),
+            EncoderType::U256 => Self::encode_fixed_u256_array(slice),
+            EncoderType::B256 => Self::encode_fixed_b256_array(slice),
+            EncoderType::Address => Self::encode_fixed_address_array(slice),
+            EncoderType::ContractId => Self::encode_fixed_contract_id_array(slice),
+            EncoderType::Identity => Self::encode_fixed_identity_array(slice),
+        }
+    }
 }

From 5bda5893059ea5145f6d5f3df5e0df9c283c8a3b Mon Sep 17 00:00:00 2001
From: bitzoic <bitzoic.eth@gmail.com>
Date: Fri, 24 Jan 2025 12:14:43 +0100
Subject: [PATCH 4/4] Remove sway-lib-core import

---
 standards/src/src16.sw | 1 -
 1 file changed, 1 deletion(-)

diff --git a/standards/src/src16.sw b/standards/src/src16.sw
index 5d51e94..ccd3a0c 100644
--- a/standards/src/src16.sw
+++ b/standards/src/src16.sw
@@ -2,7 +2,6 @@ library;
 
 use std::{bytes::Bytes, hash::*, string::String};
 use std::bytes_conversions::{b256::*, u256::*, u64::*};
-use std::core::codec::{AbiEncode, encode};
 
 /// This base ABI provides the common hashing functionality that is
 /// shared between the Fuel (SRC16) and Ethereum (EIP712) implementations.