From 75022cb34e010e111b1fbd91f3044ed2b76fda77 Mon Sep 17 00:00:00 2001
From: Green Baneling <XgreenX9999@gmail.com>
Date: Sat, 5 Aug 2023 19:00:10 +0200
Subject: [PATCH] Duplicate changes from 0.35.3 release (#543)

* Actualization of the gas prices for the `fuel-core 0.20` release

* ./Make the `fuel-tx` WASM compatible with `serde` feature enabled (#542)

* Bump version to `0.35.3`

* Fixed artifacts of rebasing

* Fix CHANGELOG.md
---
 .github/workflows/ci.yml                      |  4 ++
 CHANGELOG.md                                  |  5 ++
 Cargo.toml                                    | 16 ++---
 ci_checks.sh                                  |  4 ++
 fuel-asm/src/encoding_tests.rs                |  2 +-
 fuel-crypto/src/ed25519.rs                    |  4 +-
 fuel-tx/src/builder.rs                        | 10 ++--
 fuel-tx/src/receipt/receipt_repr.rs           |  7 +--
 fuel-tx/src/transaction.rs                    | 18 +++---
 .../transaction/consensus_parameters/gas.rs   | 30 ++++++++--
 fuel-tx/src/transaction/types.rs              | 15 ++---
 fuel-tx/src/transaction/types/create.rs       | 58 ++++++++++++-------
 fuel-tx/src/transaction/types/input.rs        |  7 ++-
 fuel-tx/src/transaction/types/input/coin.rs   | 13 +++--
 .../src/transaction/types/input/contract.rs   | 11 ++--
 .../src/transaction/types/input/message.rs    |  6 +-
 fuel-tx/src/transaction/types/mint.rs         | 10 ++--
 fuel-tx/src/transaction/types/output.rs       | 14 +++--
 fuel-tx/src/transaction/types/script.rs       | 12 ++--
 fuel-tx/src/transaction/types/utxo_id.rs      |  6 +-
 fuel-tx/src/transaction/types/witness.rs      | 25 ++++----
 fuel-tx/src/transaction/validity.rs           |  8 ++-
 fuel-tx/src/tx_pointer.rs                     |  8 ++-
 fuel-vm/src/arith.rs                          |  6 +-
 fuel-vm/src/constraints/reg_key.rs            |  8 ++-
 fuel-vm/src/interpreter/internal.rs           |  4 +-
 26 files changed, 194 insertions(+), 117 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1caacbb28b..2c94a40686 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,6 +62,10 @@ jobs:
             args: --target thumbv6m-none-eabi -p fuel-asm -p fuel-storage -p fuel-merkle --no-default-features
           - command: check
             args: --target wasm32-unknown-unknown -p fuel-crypto --no-default-features
+          - command: check
+            args: --target wasm32-unknown-unknown -p fuel-tx --features serde --no-default-features
+          - command: check
+            args: --target wasm32-unknown-unknown -p fuel-types --features serde --no-default-features
           - command: rustc
             args: --target wasm32-unknown-unknown -p fuel-types --features typescript --crate-type=cdylib
           - command: rustc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75fd18323d..ee0e3115a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - [#527](https://github.com/FuelLabs/fuel-vm/pull/527): The balances are empty during predicate estimation/verification.
 
+## [Version 0.35.3]
+
+### Changed
+
+- [#542](https://github.com/FuelLabs/fuel-vm/pull/542/): Make the `fuel-tx` WASM compatible with `serde` feature enabled.
 
 ## [Version 0.35.2]
 
diff --git a/Cargo.toml b/Cargo.toml
index 10cb3480b4..c9f514607e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,15 +18,15 @@ edition = "2021"
 homepage = "https://fuel.network/"
 license = "BUSL-1.1"
 repository = "https://github.com/FuelLabs/fuel-vm"
-version = "0.35.2"
+version = "0.35.3"
 
 [workspace.dependencies]
-fuel-asm = { version = "0.35.2", path = "fuel-asm", default-features = false }
-fuel-crypto = { version = "0.35.2", path = "fuel-crypto", default-features = false }
-fuel-merkle = { version = "0.35.2", path = "fuel-merkle", default-features = false }
-fuel-storage = { version = "0.35.2", path = "fuel-storage", default-features = false }
-fuel-tx = { version = "0.35.2", path = "fuel-tx", default-features = false }
-fuel-types = { version = "0.35.2", path = "fuel-types", default-features = false }
-fuel-vm = { version = "0.35.2", path = "fuel-vm", default-features = false }
+fuel-asm = { version = "0.35.3", path = "fuel-asm", default-features = false }
+fuel-crypto = { version = "0.35.3", path = "fuel-crypto", default-features = false }
+fuel-merkle = { version = "0.35.3", path = "fuel-merkle", default-features = false }
+fuel-storage = { version = "0.35.3", path = "fuel-storage", default-features = false }
+fuel-tx = { version = "0.35.3", path = "fuel-tx", default-features = false }
+fuel-types = { version = "0.35.3", path = "fuel-types", default-features = false }
+fuel-vm = { version = "0.35.3", path = "fuel-vm", default-features = false }
 bincode = { version = "1.3", default-features = false }
 criterion = "0.5.0"
diff --git a/ci_checks.sh b/ci_checks.sh
index de34f06f81..f6017982bc 100755
--- a/ci_checks.sh
+++ b/ci_checks.sh
@@ -24,6 +24,10 @@ cargo check --all-targets --no-default-features &&
 cargo check --all-targets --all-features &&
 cargo check --target thumbv6m-none-eabi -p fuel-asm -p fuel-storage -p fuel-merkle --no-default-features &&
 cargo check --target wasm32-unknown-unknown -p fuel-crypto --no-default-features &&
+cargo check --target wasm32-unknown-unknown -p fuel-types --features serde --no-default-features &&
+cargo check --target wasm32-unknown-unknown -p fuel-tx --features serde --no-default-features &&
+cargo rustc --target wasm32-unknown-unknown -p fuel-types --features typescript --crate-type=cdylib &&
+cargo rustc --target wasm32-unknown-unknown -p fuel-asm --features typescript --crate-type=cdylib &&
 cargo make check &&
 cargo test --all-targets --all-features &&
 cargo test --all-targets --no-default-features &&
diff --git a/fuel-asm/src/encoding_tests.rs b/fuel-asm/src/encoding_tests.rs
index 6b990a2f7a..af6c11c0a0 100644
--- a/fuel-asm/src/encoding_tests.rs
+++ b/fuel-asm/src/encoding_tests.rs
@@ -16,7 +16,7 @@ fn opcode() {
 
     for opcode_int in 0..64 {
         let Ok(op) = Opcode::try_from(opcode_int) else {
-            continue;
+            continue
         };
 
         instructions.push(op.test_construct(r, r, r, r, imm12));
diff --git a/fuel-crypto/src/ed25519.rs b/fuel-crypto/src/ed25519.rs
index 9b1b5f3bca..82197ac9e8 100644
--- a/fuel-crypto/src/ed25519.rs
+++ b/fuel-crypto/src/ed25519.rs
@@ -18,11 +18,11 @@ pub fn verify(
     message: &Message,
 ) -> Result<(), Error> {
     let Ok(signature) = Signature::from_bytes(&**signature) else {
-        return Err(Error::InvalidSignature);
+        return Err(Error::InvalidSignature)
     };
 
     let Ok(pub_key) = ed25519_dalek::PublicKey::from_bytes(&**pub_key) else {
-        return Err(Error::InvalidPublicKey);
+        return Err(Error::InvalidPublicKey)
     };
 
     if pub_key.verify_strict(&**message, &signature).is_ok() {
diff --git a/fuel-tx/src/builder.rs b/fuel-tx/src/builder.rs
index 086e962dee..0495381a69 100644
--- a/fuel-tx/src/builder.rs
+++ b/fuel-tx/src/builder.rs
@@ -40,8 +40,10 @@ use fuel_types::{
     Word,
 };
 
-use alloc::vec::Vec;
-use std::collections::HashMap;
+use alloc::{
+    collections::BTreeMap,
+    vec::Vec,
+};
 
 pub trait BuildableAloc
 where
@@ -126,7 +128,7 @@ pub struct TransactionBuilder<Tx> {
     // We take the key by reference so this lib won't have the responsibility to properly
     // zeroize the keys
     // Maps signing keys -> witness indexes
-    sign_keys: HashMap<SecretKey, u8>,
+    sign_keys: BTreeMap<SecretKey, u8>,
 }
 
 impl TransactionBuilder<Script> {
@@ -199,7 +201,7 @@ impl<Tx> TransactionBuilder<Tx> {
     fn with_tx(tx: Tx) -> Self {
         let should_prepare_script = false;
         let should_prepare_predicate = false;
-        let sign_keys = HashMap::new();
+        let sign_keys = BTreeMap::new();
 
         Self {
             tx,
diff --git a/fuel-tx/src/receipt/receipt_repr.rs b/fuel-tx/src/receipt/receipt_repr.rs
index f64a2a2184..6342577d40 100644
--- a/fuel-tx/src/receipt/receipt_repr.rs
+++ b/fuel-tx/src/receipt/receipt_repr.rs
@@ -1,5 +1,4 @@
 use crate::receipt::Receipt;
-use fuel_types::Word;
 
 macro_rules! enum_from {
     (
@@ -21,12 +20,12 @@ macro_rules! enum_from {
         }
 
         #[cfg(feature = "std")]
-        impl TryFrom<Word> for $name {
+        impl TryFrom<fuel_types::Word> for $name {
             type Error = std::io::Error;
 
-            fn try_from(x: Word) -> Result<Self, Self::Error> {
+            fn try_from(x: fuel_types::Word) -> Result<Self, Self::Error> {
                 match x {
-                    $(x if x == $name::$vname as Word => Ok($name::$vname),)*
+                    $(x if x == $name::$vname as fuel_types::Word => Ok($name::$vname),)*
                     _ => Err(std::io::Error::new(
                         std::io::ErrorKind::InvalidData,
                         "The provided identifier is invalid!",
diff --git a/fuel-tx/src/transaction.rs b/fuel-tx/src/transaction.rs
index bcb9b542b0..d3fb3c02d2 100644
--- a/fuel-tx/src/transaction.rs
+++ b/fuel-tx/src/transaction.rs
@@ -5,7 +5,6 @@ use fuel_types::{
     AssetId,
     BlockHeight,
     Bytes32,
-    ChainId,
     Nonce,
     Salt,
     Word,
@@ -58,19 +57,22 @@ pub use validity::{
 
 use crate::TxPointer;
 
+use crate::input::coin::{
+    CoinPredicate,
+    CoinSigned,
+};
+use input::*;
+
+#[cfg(feature = "std")]
 use crate::input::{
-    coin::{
-        CoinPredicate,
-        CoinSigned,
-    },
     contract::Contract,
     message::{
         MessageCoinPredicate,
         MessageDataPredicate,
     },
 };
-use input::*;
-
+#[cfg(feature = "std")]
+pub use fuel_types::ChainId;
 #[cfg(feature = "std")]
 pub use id::{
     Signable,
@@ -474,7 +476,7 @@ pub mod field {
     };
 
     use alloc::vec::Vec;
-    use std::ops::{
+    use core::ops::{
         Deref,
         DerefMut,
     };
diff --git a/fuel-tx/src/transaction/consensus_parameters/gas.rs b/fuel-tx/src/transaction/consensus_parameters/gas.rs
index 8747419e2c..50ddd10467 100644
--- a/fuel-tx/src/transaction/consensus_parameters/gas.rs
+++ b/fuel-tx/src/transaction/consensus_parameters/gas.rs
@@ -1,10 +1,7 @@
 //! Tools for gas instrumentalization
 
-use std::{
-    ops::Deref,
-    sync::Arc,
-};
-
+use alloc::sync::Arc;
+use core::ops::Deref;
 use fuel_types::Word;
 
 #[allow(dead_code)]
@@ -145,12 +142,33 @@ impl GasUnit {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 /// Gas costings for every op.
 /// The inner values are wrapped in an [`Arc`]
 /// so this is cheap to clone.
 pub struct GasCosts(Arc<GasCostsValues>);
 
+#[cfg(feature = "serde")]
+impl<'de> serde::Deserialize<'de> for GasCosts {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        Ok(GasCosts(Arc::new(serde::Deserialize::deserialize(
+            deserializer,
+        )?)))
+    }
+}
+
+#[cfg(feature = "serde")]
+impl serde::Serialize for GasCosts {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serde::Serialize::serialize(self.0.as_ref(), serializer)
+    }
+}
+
 impl GasCosts {
     /// Create new cost values wrapped in an [`Arc`].
     pub fn new(costs: GasCostsValues) -> Self {
diff --git a/fuel-tx/src/transaction/types.rs b/fuel-tx/src/transaction/types.rs
index 38009e4da9..43bb001f2a 100644
--- a/fuel-tx/src/transaction/types.rs
+++ b/fuel-tx/src/transaction/types.rs
@@ -7,13 +7,7 @@ mod storage;
 mod utxo_id;
 mod witness;
 
-use crate::TxId;
 pub use create::Create;
-use fuel_crypto::Hasher;
-use fuel_types::{
-    bytes::SerializableVec,
-    ChainId,
-};
 pub use mint::Mint;
 pub use output::{
     Output,
@@ -24,11 +18,12 @@ pub use storage::StorageSlot;
 pub use utxo_id::UtxoId;
 pub use witness::Witness;
 
-pub fn compute_transaction_id<T: SerializableVec + Clone>(
-    chain_id: &ChainId,
+#[cfg(feature = "std")]
+pub fn compute_transaction_id<T: fuel_types::bytes::SerializableVec + Clone>(
+    chain_id: &fuel_types::ChainId,
     tx: &mut T,
-) -> TxId {
-    let mut hasher = Hasher::default();
+) -> crate::TxId {
+    let mut hasher = fuel_crypto::Hasher::default();
     // chain ID
     hasher.input(chain_id.to_be_bytes());
     // transaction bytes
diff --git a/fuel-tx/src/transaction/types/create.rs b/fuel-tx/src/transaction/types/create.rs
index efe6c435c4..5e0a20a40f 100644
--- a/fuel-tx/src/transaction/types/create.rs
+++ b/fuel-tx/src/transaction/types/create.rs
@@ -1,6 +1,5 @@
 use crate::{
     transaction::{
-        compute_transaction_id,
         field::{
             BytecodeLength,
             BytecodeWitnessIndex,
@@ -13,7 +12,6 @@ use crate::{
             StorageSlots,
             Witnesses,
         },
-        metadata::CommonMetadata,
         validity::{
             check_common_part,
             FormatValidityChecks,
@@ -26,7 +24,6 @@ use crate::{
     Input,
     Output,
     StorageSlot,
-    TxId,
     Witness,
 };
 use derivative::Derivative;
@@ -40,17 +37,19 @@ use fuel_types::{
     AssetId,
     BlockHeight,
     Bytes32,
-    ChainId,
     ContractId,
-    MemLayout,
-    MemLocType,
     Salt,
     Word,
 };
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
-use core::cmp::max;
+#[cfg(feature = "std")]
+use fuel_types::{
+    ChainId,
+    MemLayout,
+    MemLocType,
+};
 #[cfg(feature = "std")]
 use std::collections::HashMap;
 #[cfg(feature = "std")]
@@ -75,9 +74,12 @@ pub struct CreateMetadata {
     pub witnesses_offset_at: Vec<usize>,
 }
 
+#[cfg(feature = "std")]
 impl CreateMetadata {
     /// Computes the `Metadata` for the `tx` transaction.
     pub fn compute(tx: &Create, chain_id: &ChainId) -> Result<Self, CheckError> {
+        use crate::transaction::metadata::CommonMetadata;
+
         let CommonMetadata {
             id,
             inputs_offset,
@@ -154,7 +156,7 @@ impl Create {
 
 #[cfg(feature = "std")]
 impl crate::UniqueIdentifier for Create {
-    fn id(&self, chain_id: &ChainId) -> TxId {
+    fn id(&self, chain_id: &ChainId) -> crate::TxId {
         if let Some(id) = self.cached_id() {
             return id
         }
@@ -169,10 +171,10 @@ impl crate::UniqueIdentifier for Create {
             .for_each(Output::prepare_sign);
         clone.witnesses_mut().clear();
 
-        compute_transaction_id(chain_id, &mut clone)
+        crate::transaction::compute_transaction_id(chain_id, &mut clone)
     }
 
-    fn cached_id(&self) -> Option<TxId> {
+    fn cached_id(&self) -> Option<crate::TxId> {
         self.metadata.as_ref().map(|m| m.id)
     }
 }
@@ -215,8 +217,10 @@ impl FormatValidityChecks for Create {
 
         // There will be at most len(witnesses) - 1 signatures to cache, as one of the
         // witnesses will be bytecode
-        let mut recovery_cache =
-            Some(HashMap::with_capacity(max(self.witnesses().len() - 1, 1)));
+        let mut recovery_cache = Some(HashMap::with_capacity(core::cmp::max(
+            self.witnesses().len() - 1,
+            1,
+        )));
 
         self.inputs()
             .iter()
@@ -293,14 +297,28 @@ impl FormatValidityChecks for Create {
             self.metadata.is_some(),
             "`check_without_signatures` is called without cached metadata"
         );
-        let (state_root_calculated, contract_id_calculated) = if let Some(metadata) =
-            &self.metadata
-        {
-            (metadata.state_root, metadata.contract_id)
-        } else {
-            let metadata = CreateMetadata::compute(self, &consensus_params.chain_id())?;
-            (metadata.state_root, metadata.contract_id)
-        };
+        let (state_root_calculated, contract_id_calculated) =
+            if let Some(metadata) = &self.metadata {
+                (metadata.state_root, metadata.contract_id)
+            } else {
+                #[cfg(feature = "std")]
+                {
+                    let metadata =
+                        CreateMetadata::compute(self, &consensus_params.chain_id())?;
+                    (metadata.state_root, metadata.contract_id)
+                }
+
+                #[cfg(not(feature = "std"))]
+                {
+                    let salt = self.salt();
+                    let storage_slots = self.storage_slots();
+                    let contract = Contract::try_from(self)?;
+                    let contract_root = contract.root();
+                    let state_root = Contract::initial_state_root(storage_slots.iter());
+                    let contract_id = contract.id(salt, &contract_root, &state_root);
+                    (state_root, contract_id)
+                }
+            };
 
         let mut contract_created = false;
         self.outputs
diff --git a/fuel-tx/src/transaction/types/input.rs b/fuel-tx/src/transaction/types/input.rs
index 52559c22ce..20d64fcdc5 100644
--- a/fuel-tx/src/transaction/types/input.rs
+++ b/fuel-tx/src/transaction/types/input.rs
@@ -2,7 +2,10 @@ use crate::{
     TxPointer,
     UtxoId,
 };
-use alloc::vec::Vec;
+use alloc::{
+    string::ToString,
+    vec::Vec,
+};
 use coin::*;
 use consts::*;
 use contract::*;
@@ -157,7 +160,7 @@ impl Default for Input {
     }
 }
 
-impl bytes::SizedBytes for Input {
+impl SizedBytes for Input {
     fn serialized_size(&self) -> usize {
         match self {
             Self::CoinSigned(coin) => WORD_SIZE + coin.serialized_size(),
diff --git a/fuel-tx/src/transaction/types/input/coin.rs b/fuel-tx/src/transaction/types/input/coin.rs
index 97ba7b8976..f9ca317fad 100644
--- a/fuel-tx/src/transaction/types/input/coin.rs
+++ b/fuel-tx/src/transaction/types/input/coin.rs
@@ -7,21 +7,20 @@ use crate::{
     TxPointer,
     UtxoId,
 };
+use alloc::vec::Vec;
 use derivative::Derivative;
 use fuel_types::{
     bytes,
-    bytes::{
-        Deserializable,
-        SizedBytes,
-    },
     Address,
     AssetId,
     BlockHeight,
     MemLayout,
-    MemLocType,
     Word,
 };
 
+#[cfg(feature = "std")]
+use fuel_types::MemLocType;
+
 pub type CoinFull = Coin<Full>;
 pub type CoinSigned = Coin<Signed>;
 pub type CoinPredicate = Coin<Predicate>;
@@ -136,7 +135,7 @@ where
     }
 }
 
-impl<Specification> SizedBytes for Coin<Specification>
+impl<Specification> bytes::SizedBytes for Coin<Specification>
 where
     Specification: CoinSpecification,
 {
@@ -164,6 +163,7 @@ where
     Specification: CoinSpecification,
 {
     fn read(&mut self, full_buf: &mut [u8]) -> std::io::Result<usize> {
+        use fuel_types::bytes::SizedBytes;
         let serialized_size = self.serialized_size();
         if full_buf.len() < serialized_size {
             return Err(bytes::eof())
@@ -274,6 +274,7 @@ where
     Specification: CoinSpecification,
 {
     fn write(&mut self, full_buf: &[u8]) -> std::io::Result<usize> {
+        use fuel_types::bytes::Deserializable;
         type S = CoinSizes;
         const LEN: usize = CoinSizes::LEN;
         let buf: &[_; LEN] = full_buf
diff --git a/fuel-tx/src/transaction/types/input/contract.rs b/fuel-tx/src/transaction/types/input/contract.rs
index 651c1146e6..442b7074dc 100644
--- a/fuel-tx/src/transaction/types/input/contract.rs
+++ b/fuel-tx/src/transaction/types/input/contract.rs
@@ -5,13 +5,13 @@ use crate::{
 };
 use fuel_types::{
     bytes,
-    bytes::{
-        Deserializable,
-        SizedBytes,
-    },
     Bytes32,
     ContractId,
     MemLayout,
+};
+
+#[cfg(feature = "std")]
+use fuel_types::{
     MemLocType,
     Word,
 };
@@ -42,7 +42,7 @@ impl Contract {
     }
 }
 
-impl SizedBytes for Contract {
+impl bytes::SizedBytes for Contract {
     #[inline(always)]
     fn serialized_size(&self) -> usize {
         ContractSizes::LEN
@@ -90,6 +90,7 @@ impl std::io::Read for Contract {
 #[cfg(feature = "std")]
 impl std::io::Write for Contract {
     fn write(&mut self, full_buf: &[u8]) -> std::io::Result<usize> {
+        use fuel_types::bytes::Deserializable;
         type S = ContractSizes;
         const LEN: usize = ContractSizes::LEN;
         let buf: &[_; LEN] = full_buf
diff --git a/fuel-tx/src/transaction/types/input/message.rs b/fuel-tx/src/transaction/types/input/message.rs
index ad4834b47f..0c9266ce8d 100644
--- a/fuel-tx/src/transaction/types/input/message.rs
+++ b/fuel-tx/src/transaction/types/input/message.rs
@@ -5,18 +5,21 @@ use crate::{
     },
     transaction::types::input::AsField,
 };
+use alloc::vec::Vec;
 use derivative::Derivative;
 use fuel_types::{
     bytes,
     bytes::SizedBytes,
     Address,
     MemLayout,
-    MemLocType,
     MessageId,
     Nonce,
     Word,
 };
 
+#[cfg(feature = "std")]
+use fuel_types::MemLocType;
+
 pub type FullMessage = Message<specifications::Full>;
 pub type MessageDataSigned = Message<specifications::MessageData<specifications::Signed>>;
 pub type MessageDataPredicate =
@@ -51,6 +54,7 @@ pub mod specifications {
         Empty,
         MessageSpecification,
     };
+    use alloc::vec::Vec;
     use fuel_types::Word;
 
     /// The type means that the message should be signed by the `recipient`, and the
diff --git a/fuel-tx/src/transaction/types/mint.rs b/fuel-tx/src/transaction/types/mint.rs
index 5f8fa42dfc..489220d074 100644
--- a/fuel-tx/src/transaction/types/mint.rs
+++ b/fuel-tx/src/transaction/types/mint.rs
@@ -1,6 +1,5 @@
 use crate::{
     transaction::{
-        compute_transaction_id,
         field::{
             Outputs,
             TxPointer as TxPointerField,
@@ -21,12 +20,15 @@ use fuel_types::{
     mem_layout,
     BlockHeight,
     Bytes32,
+    Word,
+};
+
+#[cfg(feature = "std")]
+use fuel_types::{
     ChainId,
     MemLayout,
     MemLocType,
-    Word,
 };
-
 #[cfg(feature = "std")]
 use std::io;
 
@@ -115,7 +117,7 @@ impl crate::UniqueIdentifier for Mint {
         }
 
         let mut clone = self.clone();
-        compute_transaction_id(chain_id, &mut clone)
+        crate::transaction::compute_transaction_id(chain_id, &mut clone)
     }
 
     fn cached_id(&self) -> Option<Bytes32> {
diff --git a/fuel-tx/src/transaction/types/output.rs b/fuel-tx/src/transaction/types/output.rs
index da3ce3bb71..b67e732fe4 100644
--- a/fuel-tx/src/transaction/types/output.rs
+++ b/fuel-tx/src/transaction/types/output.rs
@@ -5,8 +5,6 @@ use fuel_types::{
     AssetId,
     Bytes32,
     ContractId,
-    MemLayout,
-    MemLocType,
     Nonce,
     Word,
 };
@@ -14,9 +12,13 @@ use fuel_types::{
 use core::mem;
 
 #[cfg(feature = "std")]
-use fuel_types::bytes::{
-    SizedBytes,
-    WORD_SIZE,
+use fuel_types::{
+    bytes::{
+        SizedBytes,
+        WORD_SIZE,
+    },
+    MemLayout,
+    MemLocType,
 };
 
 #[cfg(feature = "std")]
@@ -27,6 +29,8 @@ mod repr;
 mod sizes;
 
 use consts::*;
+
+#[cfg(feature = "std")]
 use sizes::*;
 
 pub use repr::OutputRepr;
diff --git a/fuel-tx/src/transaction/types/script.rs b/fuel-tx/src/transaction/types/script.rs
index 0b24643740..917323472b 100644
--- a/fuel-tx/src/transaction/types/script.rs
+++ b/fuel-tx/src/transaction/types/script.rs
@@ -1,6 +1,5 @@
 use crate::{
     transaction::{
-        compute_transaction_id,
         consensus_parameters::TxParameters,
         field::{
             GasLimit,
@@ -37,15 +36,18 @@ use fuel_types::{
     mem_layout,
     BlockHeight,
     Bytes32,
-    ChainId,
-    MemLayout,
-    MemLocType,
     Word,
 };
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 #[cfg(feature = "std")]
+use fuel_types::{
+    ChainId,
+    MemLayout,
+    MemLocType,
+};
+#[cfg(feature = "std")]
 use std::collections::HashMap;
 #[cfg(feature = "std")]
 use std::io;
@@ -130,7 +132,7 @@ impl crate::UniqueIdentifier for Script {
             .for_each(Output::prepare_sign);
         clone.witnesses_mut().clear();
 
-        compute_transaction_id(chain_id, &mut clone)
+        crate::transaction::compute_transaction_id(chain_id, &mut clone)
     }
 
     fn cached_id(&self) -> Option<Bytes32> {
diff --git a/fuel-tx/src/transaction/types/utxo_id.rs b/fuel-tx/src/transaction/types/utxo_id.rs
index 274964d04e..b062454c4a 100644
--- a/fuel-tx/src/transaction/types/utxo_id.rs
+++ b/fuel-tx/src/transaction/types/utxo_id.rs
@@ -8,7 +8,6 @@ use fuel_types::{
     mem_layout,
     Bytes32,
     MemLayout,
-    MemLocType,
 };
 
 use core::{
@@ -17,7 +16,10 @@ use core::{
 };
 
 #[cfg(feature = "std")]
-use fuel_types::bytes;
+use fuel_types::{
+    bytes,
+    MemLocType,
+};
 
 #[cfg(feature = "std")]
 use std::io;
diff --git a/fuel-tx/src/transaction/types/witness.rs b/fuel-tx/src/transaction/types/witness.rs
index 7faa8927f6..66cb232f30 100644
--- a/fuel-tx/src/transaction/types/witness.rs
+++ b/fuel-tx/src/transaction/types/witness.rs
@@ -1,29 +1,21 @@
+use derivative::Derivative;
 use fuel_types::{
     bytes::{
         self,
         WORD_SIZE,
     },
     fmt_truncated_hex,
-    Address,
-};
-
-#[cfg(feature = "random")]
-use rand::{
-    distributions::{
-        Distribution,
-        Standard,
-    },
-    Rng,
 };
 
 use alloc::vec::Vec;
 
+#[cfg(feature = "std")]
 use crate::{
     CheckError,
     Input,
     TxId,
 };
-use derivative::Derivative;
+#[cfg(feature = "std")]
 use fuel_crypto::{
     Message,
     Signature,
@@ -31,6 +23,15 @@ use fuel_crypto::{
 #[cfg(feature = "std")]
 use std::io;
 
+#[cfg(feature = "random")]
+use rand::{
+    distributions::{
+        Distribution,
+        Standard,
+    },
+    Rng,
+};
+
 #[derive(Derivative, Default, Clone, PartialEq, Eq, Hash)]
 #[derivative(Debug)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -58,7 +59,7 @@ impl Witness {
         &self,
         txhash: &TxId,
         witness_index: usize,
-    ) -> Result<Address, CheckError> {
+    ) -> Result<fuel_types::Address, CheckError> {
         let bytes = <[u8; Signature::LEN]>::try_from(self.as_ref()).map_err(|_| {
             CheckError::InputInvalidSignature {
                 index: witness_index,
diff --git a/fuel-tx/src/transaction/validity.rs b/fuel-tx/src/transaction/validity.rs
index 6aac7b2f2d..59333e8441 100644
--- a/fuel-tx/src/transaction/validity.rs
+++ b/fuel-tx/src/transaction/validity.rs
@@ -8,14 +8,16 @@ use crate::{
 use core::hash::Hash;
 
 use fuel_types::{
-    Address,
     AssetId,
     BlockHeight,
-    ChainId,
 };
 
 #[cfg(feature = "std")]
-use fuel_types::Bytes32;
+use fuel_types::{
+    Address,
+    Bytes32,
+    ChainId,
+};
 
 use itertools::Itertools;
 #[cfg(feature = "std")]
diff --git a/fuel-tx/src/tx_pointer.rs b/fuel-tx/src/tx_pointer.rs
index 1edfd174d8..f571f91a68 100644
--- a/fuel-tx/src/tx_pointer.rs
+++ b/fuel-tx/src/tx_pointer.rs
@@ -5,8 +5,6 @@ use fuel_types::{
     },
     mem_layout,
     BlockHeight,
-    MemLayout,
-    MemLocType,
 };
 
 use core::{
@@ -15,7 +13,11 @@ use core::{
 };
 
 #[cfg(feature = "std")]
-use fuel_types::bytes;
+use fuel_types::{
+    bytes,
+    MemLayout,
+    MemLocType,
+};
 
 #[cfg(feature = "std")]
 use std::io;
diff --git a/fuel-vm/src/arith.rs b/fuel-vm/src/arith.rs
index 1ddc02e940..d7247a1eb3 100644
--- a/fuel-vm/src/arith.rs
+++ b/fuel-vm/src/arith.rs
@@ -41,7 +41,7 @@ pub fn checked_sub_usize(a: usize, b: usize) -> Result<usize, PanicReason> {
 #[inline(always)]
 pub fn add_word(a: Word, b: Word) -> Result<Word, RuntimeError> {
     #[cfg(feature = "optimized")]
-    #[allow(clippy::integer_arithmetic)]
+    #[allow(clippy::arithmetic_side_effects)]
     {
         Ok(a + b)
     }
@@ -61,7 +61,7 @@ pub fn add_word(a: Word, b: Word) -> Result<Word, RuntimeError> {
 /// This should be used in contexts that are checked and guaranteed by the protocol to
 /// never overflow, but then they might due to some bug in the code.
 #[inline(always)]
-#[allow(clippy::integer_arithmetic)]
+#[allow(clippy::arithmetic_side_effects)]
 pub fn sub_word(a: Word, b: Word) -> Result<Word, RuntimeError> {
     #[cfg(feature = "optimized")]
     {
@@ -78,7 +78,7 @@ pub fn sub_word(a: Word, b: Word) -> Result<Word, RuntimeError> {
 /// Add two numbers. Should be used only in compile-time evaluations so the code won't
 /// compile in case of unexpected overflow.
 #[inline(always)]
-#[allow(clippy::integer_arithmetic)]
+#[allow(clippy::arithmetic_side_effects)]
 pub const fn add_usize(a: usize, b: usize) -> usize {
     a + b
 }
diff --git a/fuel-vm/src/constraints/reg_key.rs b/fuel-vm/src/constraints/reg_key.rs
index 21ec13d553..bdd12d9e37 100644
--- a/fuel-vm/src/constraints/reg_key.rs
+++ b/fuel-vm/src/constraints/reg_key.rs
@@ -288,7 +288,9 @@ impl<'r> ProgramRegisters<'r> {
                 // Translate the `a` absolute register index to a program register index.
                 let a = a.translate();
                 // Split the array at the first register which is a.
-                let [i, rest @ ..] = &mut self.0[a..] else { return None };
+                let [i, rest @ ..] = &mut self.0[a..] else {
+                    return None
+                };
                 // Translate the `b` absolute register index to a program register index.
                 // Subtract 1 because the first register is `a`.
                 // Subtract `a` registers because we split the array at `a`.
@@ -303,7 +305,9 @@ impl<'r> ProgramRegisters<'r> {
                 // Translate the `b` absolute register index to a program register index.
                 let b = b.translate();
                 // Split the array at the first register which is b.
-                let [i, rest @ ..] = &mut self.0[b..] else { return None };
+                let [i, rest @ ..] = &mut self.0[b..] else {
+                    return None
+                };
                 // Translate the `a` absolute register index to a program register index.
                 // Subtract 1 because the first register is `b`.
                 // Subtract `b` registers because we split the array at `b`.
diff --git a/fuel-vm/src/interpreter/internal.rs b/fuel-vm/src/interpreter/internal.rs
index a409f12596..633c86d63e 100644
--- a/fuel-vm/src/interpreter/internal.rs
+++ b/fuel-vm/src/interpreter/internal.rs
@@ -228,7 +228,9 @@ pub(crate) fn set_flag(
     pc: RegMut<PC>,
     a: Word,
 ) -> Result<(), RuntimeError> {
-    let Some(flags) = Flags::from_bits(a) else { return Err(PanicReason::ErrorFlag.into()) };
+    let Some(flags) = Flags::from_bits(a) else {
+        return Err(PanicReason::ErrorFlag.into())
+    };
 
     *flag = flags.bits();