Bump to forc 0.44.1

.github/workflows/ci.yml

@@ -15,9 +15,9 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   REGISTRY: ghcr.io
-  RUST_VERSION: 1.69.0
-  FORC_VERSION: 0.40.1
-  CORE_VERSION: 0.18.1
+  RUST_VERSION: 1.71.1
+  FORC_VERSION: 0.44.1
+  CORE_VERSION: 0.20.3
   PATH_TO_SCRIPTS: .github/scripts
 
 jobs:

README.md

@@ -32,7 +32,6 @@ These libraries contain helper functions and other tools valuable to blockchain
 ### Libraries
 
 - [Binary Merkle Proof](./libs/merkle_proof/) is used to verify Binary Merkle Trees computed off-chain.
-- [Non-Fungible Token (NFT)](./libs/nft/) is a token library which provides unqiue collectibles, identified and differentiated by token IDs.
 - [Ownership](./libs/ownership/) is used to apply restrictions on functions such that only a single user may call them.
 - [Reentrancy](./libs/reentrancy) is used to detect and prevent reentrancy attacks.
 - [Signed Integers](./libs/signed_integers/) is an interface to implement signed integers.

libs/Forc.toml

@@ -2,7 +2,6 @@
 members = [
   "fixed_point",
   "merkle_proof",
-  "nft",
   "ownership",
   "queue",
   "reentrancy",

libs/nft/README.md → libs/archive/nft/README.md

@@ -5,6 +5,9 @@
     </picture>
 </p>
 
+> **Warning**
+> This library has been deprecated with the introduction of [Sway multi-token standard](https://github.com/FuelLabs/sway-standards/issues/1). Use of this library is *highly* discouraged. The last supported version is forc v0.40.1.
+
 ## Overview
 
 A non-fungible token (NFT) is a unique token that has an identifier which distinguishes itself from other tokens within the same token contract. Unlike Fuel's Native Assets, these tokens are not fungible with one another and may contain metadata or other traits giving them distinctive characteristics.

libs/fixed_point/src/ufp32.sw

@@ -169,12 +169,12 @@ impl core::ops::Subtract for UFP32 {
 impl core::ops::Multiply for UFP32 {
     /// Multiply a UFP32 with a UFP32. Panics of overflow.
     fn multiply(self, other: Self) -> Self {
-        let self_u64: u64 = self.value;
-        let other_u64: u64 = other.value;
+        let self_u64: u64 = self.value.as_u64();
+        let other_u64: u64 = other.value.as_u64();
 
         let self_multiply_other = self_u64 * other_u64;
         let res_u64 = self_multiply_other >> 16;
-        if res_u64 > u32::max() {
+        if res_u64 > u32::max().as_u64() {
             // panic on overflow
             revert(0);
         }
@@ -191,18 +191,18 @@ impl core::ops::Divide for UFP32 {
         let zero = UFP32::zero();
         assert(divisor != zero);
 
-        let denominator: u64 = Self::denominator();
+        let denominator: u64 = Self::denominator().as_u64();
         // Conversion to U64 done to ensure no overflow happen
         // and maximal precision is avaliable
         // as it makes possible to multiply by the denominator in 
         // all cases
-        let self_u64: u64 = self.value;
-        let divisor_u64: u64 = divisor.value;
+        let self_u64: u64 = self.value.as_u64();
+        let divisor_u64: u64 = divisor.value.as_u64();
 
         // Multiply by denominator to ensure accuracy 
         let res_u64 = self_u64 * denominator / divisor_u64;
 
-        if res_u64 > u32::max() {
+        if res_u64 > u32::max().as_u64() {
             // panic on overflow
             revert(0);
         }
@@ -454,7 +454,7 @@ impl Power for UFP32 {
         // which means that the denominator is always 2 ^ 16
         // we need to divide the nominator by 2 ^ (16 * exponent - 1)
         // - 1 is the formula is due to denominator need to stay 2 ^ 16
-        let nominator = nominator_pow >> 16 * (exponent_int - 1u32);
+        let nominator = nominator_pow >> 16 * (exponent_int - 1u32).as_u64();
 
         if nominator > u32::max() {
             // panic on overflow

tests/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [dependencies]
 fuel-merkle = { version = "0.33.0" }
-fuels = { version = "0.42.0", features = ["fuel-core-lib"] }
+fuels = { version = "0.46.0", features = ["fuel-core-lib"] }
 sha2 = { version = "0.10" }
 tokio = { version = "1.12", features = ["rt", "macros"] }
 

tests/Forc.toml

@@ -24,8 +24,6 @@ members = [
   "./src/fixed_point/ifp256_div_test",
   "./src/fixed_point/ifp256_test",
   "./src/merkle_proof",
-  "./src/nft/nft_core",
-  "./src/nft/nft_extensions",
   "./src/ownership",
   "./src/reentrancy/reentrancy_attacker_abi",
   "./src/reentrancy/reentrancy_attacker_contract",

tests/src/fixed_point/ufp32_test/src/main.sw

@@ -26,7 +26,7 @@ fn main() -> bool {
 
     // recip
     let mut value = UFP32 {
-        value: 1 << 32 + 3,
+        value: 3u32,
     };
     res = UFP32::recip(value);
     assert(UFP32 {
@@ -35,21 +35,21 @@ fn main() -> bool {
 
     // trunc
     value = UFP32 {
-        value: (1 << 32) + 3,
+        value: 3u32,
     };
     res = value.trunc();
     assert(UFP32::from_uint(1) == res);
 
     // floor
     value = UFP32 {
-        value: (1 << 32) + 3,
+        value: 3u32,
     };
     res = value.floor();
     assert(UFP32::from_uint(1) == res);
 
     // fract
     value = UFP32 {
-        value: (1 << 32) + 3,
+        value: 3u32,
     };
     res = value.fract();
     assert(UFP32 { value: 3 } == res);
@@ -60,7 +60,7 @@ fn main() -> bool {
 
     // ceil
     value = UFP32 {
-        value: (1 << 32) + 3,
+        value: 3u32,
     };
     res = value.ceil();
     assert(UFP32::from_uint(2) == res);
@@ -71,13 +71,13 @@ fn main() -> bool {
 
     // round
     value = UFP32 {
-        value: (1 << 32) + 3,
+        value: 3u32,
     };
     res = value.round();
     assert(UFP32::from_uint(1) == res);
 
     value = UFP32 {
-        value: (1 << 32) + (1 << 31) + 1,
+        value: 2147483649u32,
     };
     res = value.round();
     assert(UFP32::from_uint(2) == res);

tests/src/harness.rs

@@ -2,7 +2,6 @@
 
 mod fixed_point;
 mod merkle_proof;
-mod nft;
 mod ownership;
 mod reentrancy;
 mod signed_integers;