Merge branch 'master' into Salka1988/return_result

FuelLabs · Oct 4, 2023 · fa06ff2 · fa06ff2
2 parents f5d7e3e + 2a6d052
commit fa06ff2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/packages/fuels-core/src/codec/abi_decoder.rs b/packages/fuels-core/src/codec/abi_decoder.rs
@@ -84,6 +84,7 @@ mod tests {
     use std::vec;
 
     use super::*;
+    use crate::types::U256;
     use crate::{
         constants::WORD_SIZE,
         types::{enum_variants::EnumVariants, errors::Error, StaticStringToken},
@@ -106,11 +107,19 @@ mod tests {
             ParamType::U8,
             ParamType::U16,
             ParamType::U64,
+            ParamType::U128,
+            ParamType::U256,
         ];
         let data = [
-            0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff,
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-            0xff,
+            0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xff, // u32
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, // u8
+            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, // u16
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, // u64
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, // u128
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+            0xff, 0xff, 0xff, 0xff, // u256
         ];
 
         let decoded = ABIDecoder::default().decode_multiple(&types, &data)?;
@@ -120,6 +129,8 @@ mod tests {
             Token::U8(u8::MAX),
             Token::U16(u16::MAX),
             Token::U64(u64::MAX),
+            Token::U128(u128::MAX),
+            Token::U256(U256::MAX),
         ];
         assert_eq!(decoded, expected);
         Ok(())

diff --git a/packages/fuels-core/src/codec/abi_encoder.rs b/packages/fuels-core/src/codec/abi_encoder.rs
@@ -1200,4 +1200,17 @@ mod tests {
 
         Ok(())
     }
+
+    #[test]
+    fn encoding_large_unsigned_integers() -> Result<()> {
+        let token = Token::U128(u128::MAX);
+        let expected_encoding = [255; 16];
+        let result = ABIEncoder::encode(&[token])?.resolve(0);
+        assert_eq!(result, expected_encoding);
+        let token = Token::U256(U256::MAX);
+        let expected_encoding = [255; 32];
+        let result = ABIEncoder::encode(&[token])?.resolve(0);
+        assert_eq!(result, expected_encoding);
+        Ok(())
+    }
 }