feat!: upgrade fuel-core to v0.20.1 (#1053)

This pull request is an upgrade to a `fuel-core 0.20.1` release. --------- Co-authored-by: Rodrigo Araújo <rod.dearaujo@gmail.com> Co-authored-by: leviathanbeak88 <elvisdedic@outlook.com> Co-authored-by: hal3e <git@hal3e.io> Co-authored-by: MujkicA <32431923+MujkicA@users.noreply.github.com>
FuelLabs · Aug 8, 2023 · c64aeca · c64aeca
1 parent e2d86bb
commit c64aeca
Show file tree

Hide file tree

Showing 124 changed files with 232 additions and 93 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,10 +16,10 @@ env:
   CARGO_TERM_COLOR: always
   DASEL_VERSION: https://github.com/TomWright/dasel/releases/download/v1.24.3/dasel_linux_amd64
   RUSTFLAGS: "-D warnings"
-  FUEL_CORE_VERSION: 0.19.1
+  FUEL_CORE_VERSION: 0.20.3
   RUST_VERSION: 1.70.0
   FORC_VERSION: 0.42.1
-  FORC_PATCH_BRANCH: ""
+  FORC_PATCH_BRANCH: "upgrade/fuel-core-v0.20.1"
   FORC_PATCH_REVISION: ""
 
 jobs:

diff --git a/Cargo.toml b/Cargo.toml
@@ -45,17 +45,6 @@ chrono = "0.4.24"
 elliptic-curve = { version = "0.13.4", default-features = false }
 eth-keystore = "0.5.0"
 fuel-abi-types = "0.3.0"
-fuel-core = { version = "0.19.1", default-features = false }
-fuel-core-chain-config = { version = "0.19.1", default-features = false }
-fuel-core-client = { version = "0.19.1", default-features = false }
-fuel-core-types = { version = "0.19.1", default-features = false }
-fuel-asm = "0.34.0"
-fuel-crypto = "0.34.0"
-fuel-merkle = "0.34.0"
-fuel-storage = "0.34.0"
-fuel-tx = "0.34.0"
-fuel-types = { version = "0.34.0", default-features = false }
-fuel-vm = "0.34.0"
 fuels = { version = "0.44.0", path = "./packages/fuels" }
 fuels-accounts = { version = "0.44.0", path = "./packages/fuels-accounts", default-features = false }
 fuels-code-gen = { version = "0.44.0", path = "./packages/fuels-code-gen", default-features = false }
@@ -84,3 +73,18 @@ thiserror = { version = "1.0.40", default-features = false }
 tokio = { version = "1.27.0", default-features = false }
 trybuild = "1.0.80"
 which = { version = "4.4", default-features = false }
+
+# Dependencies from the `fuel-core` repository:
+fuel-core = { version = "0.20.3", default-features = false }
+fuel-core-chain-config = { version = "0.20.3", default-features = false }
+fuel-core-client = { version = "0.20.3", default-features = false }
+fuel-core-types = { version = "0.20.3", default-features = false }
+
+# Dependencies from the `fuel-vm` repository:
+fuel-asm = "0.35.3"
+fuel-crypto = "0.35.3"
+fuel-merkle = "0.35.3"
+fuel-storage = "0.35.3"
+fuel-tx = "0.35.3"
+fuel-types = { version = "0.35.3", default-features = false }
+fuel-vm = "0.35.3"
diff --git a/examples/contracts/src/lib.rs b/examples/contracts/src/lib.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod tests {
     use fuels::types::errors::{error, Error, Result};
+    use fuels::types::Bits256;
 
     #[tokio::test]
     async fn instantiate_client() -> Result<()> {
@@ -104,7 +105,7 @@ mod tests {
             .await?;
         // ANCHOR_END: contract_call_cost_estimation
 
-        assert_eq!(transaction_cost.gas_used, 499);
+        assert_eq!(transaction_cost.gas_used, 333);
 
         Ok(())
     }
@@ -344,10 +345,11 @@ mod tests {
         let response = contract_methods.mint_coins(1_000_000).call().await?;
         // ANCHOR: variable_outputs
         let address = wallet.address();
+        let asset_id = contract_id.asset_id(&Bits256::zeroed()).into();
 
         // withdraw some tokens to wallet
         let response = contract_methods
-            .transfer_coins_to_output(1_000_000, contract_id, address)
+            .transfer_coins_to_output(1_000_000, asset_id, address)
             .append_variable_outputs(1)
             .call()
             .await?;
@@ -406,7 +408,7 @@ mod tests {
             .await?;
         // ANCHOR_END: dependency_estimation_manual
 
-        let asset_id = AssetId::from(*caller_contract_id.hash());
+        let asset_id = caller_contract_id.asset_id(&Bits256::zeroed());
         let balance = wallet.get_asset_balance(&asset_id).await?;
         assert_eq!(balance, amount);
 
@@ -527,10 +529,10 @@ mod tests {
         let contract_methods = MyContract::new(contract_id, wallet.clone()).methods();
 
         // ANCHOR: call_params_gas
-        // Set the transaction `gas_limit` to 10_000 and `gas_forwarded` to 4300 to specify that
-        // the contract call transaction may consume up to 10_000 gas, while the actual call may
+        // Set the transaction `gas_limit` to 1_000_000 and `gas_forwarded` to 4300 to specify that
+        // the contract call transaction may consume up to 1_000_000 gas, while the actual call may
         // only use 4300 gas
-        let tx_params = TxParameters::default().set_gas_limit(10_000);
+        let tx_params = TxParameters::default().set_gas_limit(1_000_000);
         let call_params = CallParameters::default().set_gas_forwarded(4300);
 
         let response = contract_methods
@@ -628,7 +630,7 @@ mod tests {
             .await?;
         // ANCHOR_END: multi_call_cost_estimation
 
-        assert_eq!(transaction_cost.gas_used, 786);
+        assert_eq!(transaction_cost.gas_used, 546);
 
         Ok(())
     }

diff --git a/examples/cookbook/src/lib.rs b/examples/cookbook/src/lib.rs
@@ -1,5 +1,6 @@
 #[cfg(test)]
 mod tests {
+    use fuels::types::Bits256;
     use fuels::{
         prelude::Result,
         types::transaction_builders::{ScriptTransactionBuilder, TransactionBuilder},
@@ -65,7 +66,7 @@ mod tests {
         // ANCHOR_END: liquidity_deposit
 
         // ANCHOR: liquidity_withdraw
-        let lp_asset_id = AssetId::from(*contract_id.hash());
+        let lp_asset_id = contract_id.asset_id(&Bits256::zeroed());
         let lp_token_balance = wallet.get_asset_balance(&lp_asset_id).await?;
 
         let call_params = CallParameters::default()

diff --git a/packages/fuels-accounts/src/lib.rs b/packages/fuels-accounts/src/lib.rs
@@ -405,7 +405,7 @@ mod tests {
         let message = Message::from_bytes(*tx.id(consensus_parameters.chain_id.into()));
 
         // Check if signature is what we expect it to be
-        assert_eq!(signature, Signature::from_str("13ce336c5f239a748f20f39323e3df3237ccfe104b04f128be66f26a49abd09d3b4b19c7f07efbb708c442371feb5fc6545f2b614e1f9f336702cca3e62d0cc8")?);
+        assert_eq!(signature, Signature::from_str("df91e8ae723165f9a28b70910e3da41300da413607065618522f3084c9f051114acb1b51a836bd63c3d84a1ac904bf37b82ef03973c19026b266d04872f170a6")?);
 
         // Recover address that signed the transaction
         let recovered_address = signature.recover(&message)?;

diff --git a/packages/fuels-core/src/types.rs b/packages/fuels-core/src/types.rs
@@ -23,7 +23,7 @@ pub type ByteArray = [u8; 8];
 pub type Selector = ByteArray;
 pub type EnumSelector = (u8, Token, EnumVariants);
 
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
+#[derive(Debug, Clone, PartialEq, Eq, Default, serde::Serialize, serde::Deserialize)]
 pub struct StringToken {
     data: String,
     expected_len: Option<usize>,
@@ -70,7 +70,7 @@ impl TryFrom<StringToken> for String {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 pub enum Token {
     // Used for unit type variants in Enum. An "empty" enum is not represented as Enum<empty box>,
     // because this way we can have both unit and non-unit type variants.

diff --git a/packages/fuels-core/src/types/bech32.rs b/packages/fuels-core/src/types/bech32.rs
@@ -3,8 +3,10 @@ use std::{
     str::FromStr,
 };
 
+use crate::types::Bits256;
 use bech32::{FromBase32, ToBase32, Variant::Bech32m};
-use fuel_tx::{Address, Bytes32, ContractId};
+use fuel_tx::{Address, Bytes32, ContractId, ContractIdExt};
+use fuel_types::AssetId;
 
 use crate::types::errors::{Error, Result};
 
@@ -128,6 +130,14 @@ impl From<ContractId> for Bech32ContractId {
     }
 }
 
+impl Bech32ContractId {
+    /// Creates an `AssetId` from the `Bech32ContractId` and `sub_id`.
+    pub fn asset_id(&self, sub_id: &Bits256) -> AssetId {
+        let sub_id = Bytes32::from(sub_id.0);
+        ContractId::from(self).asset_id(&sub_id)
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

diff --git a/packages/fuels-core/src/types/core/bits.rs b/packages/fuels-core/src/types/core/bits.rs
@@ -1,3 +1,4 @@
+use fuel_types::AssetId;
 use fuels_macros::{Parameterize, Tokenizable, TryFrom};
 
 use crate::types::errors::{error, Error, Result};
@@ -9,6 +10,11 @@ use crate::types::errors::{error, Error, Result};
 pub struct Bits256(pub [u8; 32]);
 
 impl Bits256 {
+    /// Returns `Self` with zeroes inside.
+    pub fn zeroed() -> Self {
+        Self([0; 32])
+    }
+
     /// Create a new `Bits256` from a string representation of a hex.
     /// Accepts both `0x` prefixed and non-prefixed hex strings.
     pub fn from_hex_str(hex: &str) -> Result<Self> {
@@ -29,6 +35,12 @@ impl Bits256 {
     }
 }
 
+impl From<AssetId> for Bits256 {
+    fn from(value: AssetId) -> Self {
+        Self(value.into())
+    }
+}
+
 // A simple wrapper around [Bits256; 2] representing the `B512` type.
 #[derive(Debug, PartialEq, Eq, Copy, Clone, Parameterize, Tokenizable, TryFrom)]
 #[FuelsCorePath = "crate"]

diff --git a/packages/fuels-core/src/types/enum_variants.rs b/packages/fuels-core/src/types/enum_variants.rs
@@ -6,7 +6,7 @@ use crate::{
     },
 };
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct EnumVariants {
     param_types: Vec<ParamType>,
 }

diff --git a/packages/fuels-core/src/types/param_types.rs b/packages/fuels-core/src/types/param_types.rs
@@ -14,7 +14,7 @@ use crate::{
     },
 };
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub enum ParamType {
     U8,
     U16,

diff --git a/packages/fuels-core/src/utils/constants.rs b/packages/fuels-core/src/utils/constants.rs
@@ -6,7 +6,7 @@ pub const WORD_SIZE: usize = core::mem::size_of::<Word>();
 
 // ANCHOR: default_tx_parameters
 pub const DEFAULT_GAS_PRICE: u64 = 0;
-pub const DEFAULT_GAS_LIMIT: u64 = 1_000_000;
+pub const DEFAULT_GAS_LIMIT: u64 = 100_000_000;
 pub const DEFAULT_MATURITY: u32 = 0;
 // ANCHOR_END: default_tx_parameters
 

diff --git a/packages/fuels-programs/src/logs.rs b/packages/fuels-programs/src/logs.rs
@@ -179,7 +179,12 @@ impl<'a, I: Iterator<Item = &'a Receipt>> ExtractLogIdData for I {
     type Output = FilterMap<Self, fn(&Receipt) -> Option<(LogId, Vec<u8>)>>;
     fn extract_log_id_and_data(self) -> Self::Output {
         self.filter_map(|r| match r {
-            Receipt::LogData { rb, data, id, .. } => Some((LogId(*id, *rb), data.clone())),
+            Receipt::LogData {
+                rb,
+                data: Some(data),
+                id,
+                ..
+            } => Some((LogId(*id, *rb), data.clone())),
             Receipt::Log { ra, rb, id, .. } => Some((LogId(*id, *rb), ra.to_be_bytes().to_vec())),
             _ => None,
         })

diff --git a/packages/fuels-programs/src/receipt_parser.rs b/packages/fuels-programs/src/receipt_parser.rs
@@ -71,7 +71,12 @@ impl ReceiptParser {
 
     fn extract_return_data(&mut self, contract_id: &ContractId) -> Option<Vec<u8>> {
         for (index, receipt) in self.receipts.iter_mut().enumerate() {
-            if let Receipt::ReturnData { id, data, .. } = receipt {
+            if let Receipt::ReturnData {
+                id,
+                data: Some(data),
+                ..
+            } = receipt
+            {
                 if id == contract_id {
                     let data = std::mem::take(data);
                     self.receipts.remove(index);
@@ -134,10 +139,10 @@ impl ReceiptParser {
                     ..
                 },
             ) if *first_id == *contract_id
-                && !first_data.is_empty()
+                && first_data.is_some()
                 && *second_id == ContractId::zeroed() =>
             {
-                Some(vec_data)
+                vec_data.as_ref()
             }
             _ => None,
         }
@@ -176,7 +181,7 @@ mod tests {
             ptr: Default::default(),
             len: Default::default(),
             digest: Default::default(),
-            data: data.to_vec(),
+            data: Some(data.to_vec()),
             pc: Default::default(),
             is: Default::default(),
         }

diff --git a/packages/fuels/src/lib.rs b/packages/fuels/src/lib.rs
@@ -14,8 +14,8 @@
 
 pub mod tx {
     pub use fuel_tx::{
-        field, Bytes32, ConsensusParameters, Receipt, Salt, ScriptExecutionResult, StorageSlot,
-        Transaction as FuelTransaction, TxId,
+        field, Bytes32, ConsensusParameters, ContractIdExt, Receipt, Salt, ScriptExecutionResult,
+        StorageSlot, Transaction as FuelTransaction, TxId,
     };
 }
 

diff --git a/packages/fuels/tests/bindings/sharing_types/contract_a/Forc.toml b/packages/fuels/tests/bindings/sharing_types/contract_a/Forc.toml
@@ -6,3 +6,4 @@ name = "contract_a"
 
 [dependencies]
 shared_lib = { path = "../shared_lib" }
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/bindings/sharing_types/contract_b/Forc.toml b/packages/fuels/tests/bindings/sharing_types/contract_b/Forc.toml
@@ -6,3 +6,4 @@ name = "contract_b"
 
 [dependencies]
 shared_lib = { path = "../shared_lib" }
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/bindings/sharing_types/shared_lib/Forc.toml b/packages/fuels/tests/bindings/sharing_types/shared_lib/Forc.toml
@@ -5,3 +5,4 @@ license = "Apache-2.0"
 name = "shared_lib"
 
 [dependencies]
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/bindings/simple_contract/Forc.toml b/packages/fuels/tests/bindings/simple_contract/Forc.toml
@@ -5,3 +5,4 @@ license = "Apache-2.0"
 name = "simple_contract"
 
 [dependencies]
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/bindings/type_paths/Forc.toml b/packages/fuels/tests/bindings/type_paths/Forc.toml
@@ -5,3 +5,4 @@ license = "Apache-2.0"
 name = "type_paths"
 
 [dependencies]
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/contracts.rs b/packages/fuels/tests/contracts.rs
@@ -280,7 +280,7 @@ async fn test_contract_call_fee_estimation() -> Result<()> {
     let tolerance = 0.2;
 
     let expected_min_gas_price = 0; // This is the default min_gas_price from the ConsensusParameters
-    let expected_gas_used = 598;
+    let expected_gas_used = 399;
     let expected_metered_bytes_size = 728;
     let expected_total_fee = 372;
 
@@ -620,7 +620,7 @@ async fn test_connect_wallet() -> Result<()> {
     // pay for call with wallet
     let tx_params = TxParameters::default()
         .set_gas_price(10)
-        .set_gas_limit(10000);
+        .set_gas_limit(1_000_000);
     contract_instance
         .methods()
         .initialize_counter(42)
@@ -661,7 +661,7 @@ async fn setup_output_variable_estimation_test(
     .deploy(&wallets[0], TxParameters::default())
     .await?;
 
-    let mint_asset_id = AssetId::from(*contract_id.hash());
+    let mint_asset_id = contract_id.asset_id(&Bits256::zeroed());
     let addresses: [Address; 3] = wallets
         .iter()
         .map(|wallet| wallet.address().into())

diff --git a/packages/fuels/tests/contracts/asserts/Forc.toml b/packages/fuels/tests/contracts/asserts/Forc.toml
@@ -5,3 +5,4 @@ license = "Apache-2.0"
 name = "asserts"
 
 [dependencies]
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/contracts/auth_testing_abi/Forc.toml b/packages/fuels/tests/contracts/auth_testing_abi/Forc.toml
@@ -5,3 +5,4 @@ license = "Apache-2.0"
 name = "auth_testing_abi"
 
 [dependencies]
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/contracts/auth_testing_contract/Forc.toml b/packages/fuels/tests/contracts/auth_testing_contract/Forc.toml
@@ -5,5 +5,5 @@ license = "Apache-2.0"
 name = "auth_testing_contract"
 
 [dependencies]
-
 auth_testing_abi = { path = "../auth_testing_abi" }
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/contracts/block_timestamp/Forc.toml b/packages/fuels/tests/contracts/block_timestamp/Forc.toml
@@ -5,3 +5,4 @@ license = "Apache-2.0"
 name = "block_timestamp"
 
 [dependencies]
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/contracts/configurables/Forc.toml b/packages/fuels/tests/contracts/configurables/Forc.toml
@@ -5,3 +5,4 @@ license = "Apache-2.0"
 name = "configurables"
 
 [dependencies]
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/contracts/contract_test/Forc.toml b/packages/fuels/tests/contracts/contract_test/Forc.toml
@@ -6,3 +6,4 @@ name = "contract_test"
 
 [dependencies]
 increment_abi = { path = "../library_test", package = "library_test" }
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/contracts/large_return_data/Forc.toml b/packages/fuels/tests/contracts/large_return_data/Forc.toml
@@ -5,3 +5,4 @@ license = "Apache-2.0"
 name = "large_return_data"
 
 [dependencies]
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/contracts/lib_contract/Forc.toml b/packages/fuels/tests/contracts/lib_contract/Forc.toml
@@ -6,3 +6,4 @@ name = "lib_contract"
 
 [dependencies]
 lib_contract = { path = "../lib_contract_abi/", package = "lib_contract_abi" }
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }
diff --git a/packages/fuels/tests/contracts/lib_contract_abi/Forc.toml b/packages/fuels/tests/contracts/lib_contract_abi/Forc.toml
@@ -5,3 +5,4 @@ license = "Apache-2.0"
 name = "lib_contract_abi"
 
 [dependencies]
+std = { git = "https://github.com/FuelLabs/sway", branch = "upgrade/fuel-core-v0.20.1" }