Merge pull request #1 from CetusProtocol/sui

Sui

Author: CetusProtocol

.gitignore

@@ -1,3 +1,8 @@
+/sui/.idea
+/aptos/.idea
+/aptos/.aptos
+/sui/build
+/aptos/build
 /build
 /.idea
-.idea
+/.aptos

Move.toml aptos/Aptos.tomlMove.toml renamed to aptos/Aptos.toml

@@ -0,0 +1,14 @@
+[package]
+name = 'IntegerMate'
+version = '1.0.0'
+
+[addresses]
+std = "0x1"
+aptos_std = "0x1"
+aptos_framework = "0x1"
+integer_mate = "_"
+
+[dependencies.MoveStdlib]
+git = "https://github.com/aptos-labs/aptos-core.git"
+subdir = "aptos-move/framework/move-stdlib"
+rev = "devnet"

aptos/Move.toml

@@ -0,0 +1,10 @@
+[package]
+name = "IntegerMate"
+version = "0.0.1"
+
+[dependencies]
+Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework", rev = "devnet" }
+
+[addresses]
+integer_mate =  "0x0"
+sui =  "0000000000000000000000000000000000000002"

aptos/Sui.toml

@@ -0,0 +1,30 @@
+module integer_mate::full_math_u128 {
+    public fun mul_div_floor(num1: u128, num2: u128, denom: u128): u128 {
+        let r = full_mul(num1, num2) / (denom as u256);
+        (r as u128)
+    }
+
+    public fun mul_div_round(num1: u128, num2: u128, denom: u128): u128 {
+        let r = (full_mul(num1, num2) + ((denom as u256) >> 1)) / (denom as u256);
+        (r as u128)
+    }
+
+    public fun mul_div_ceil(num1: u128, num2: u128, denom: u128): u128 {
+        let r = (full_mul(num1, num2) + ((denom as u256) - 1)) / (denom as u256);
+        (r as u128)
+    }
+
+    public fun mul_shr(num1: u128, num2: u128, shift: u8): u128 {
+        let product = full_mul(num1, num2) >> shift;
+        (product as u128)
+    }
+
+    public fun mul_shl(num1: u128, num2: u128, shift: u8): u128 {
+        let product = full_mul(num1, num2) << shift;
+        (product as u128)
+    }
+
+    public fun full_mul(num1: u128, num2: u128): u256 {
+        (num1 as u256) * (num2 as u256)
+    }
+}

aptos/sources/full_math_u128.move

@@ -1,26 +1,26 @@
 module integer_mate::full_math_u64 {
     public fun mul_div_floor(num1: u64, num2: u64, denom: u64): u64 {
-        let r = ((num1 as u128) * (num2 as u128)) / (denom as u128);
+        let r = full_mul(num1, num2) / (denom as u128);
         (r as u64)
     }
 
     public fun mul_div_round(num1: u64, num2: u64, denom: u64): u64 {
-        let r = (((num1 as u128) * (num2 as u128)) + ((denom as u128) >> 1)) / (denom as u128);
+        let r = (full_mul(num1, num2) + ((denom as u128) >> 1)) / (denom as u128);
         (r as u64)
     }
 
     public fun mul_div_ceil(num1: u64, num2: u64, denom: u64): u64 {
-        let r = (((num1 as u128) * (num2 as u128)) + ((denom as u128) - 1)) / (denom as u128);
+        let r = (full_mul(num1, num2) + ((denom as u128) - 1)) / (denom as u128);
         (r as u64)
     }
 
     public fun mul_shr(num1: u64, num2: u64, shift: u8): u64 {
-        let r = ((num1 as u128) * (num2 as u128)) >> shift;
+        let r = full_mul(num1, num2) >> shift;
         (r as u64)
     }
 
     public fun mul_shl(num1: u64, num2: u64, shift: u8): u64 {
-        let r = ((num1 as u128) * (num2 as u128)) << shift;
+        let r = full_mul(num1, num2) << shift;
         (r as u64)
     }
 

sources/full_math_u64.move aptos/sources/full_math_u64.movesources/full_math_u64.move renamed to aptos/sources/full_math_u64.move

@@ -1,8 +1,8 @@
 module integer_mate::i128 {
-    use std::error;
     use integer_mate::i64;
+    use integer_mate::i32;
 
-    const OVERFLOW: u64 = 0;
+    const EOverflow: u64 = 0;
 
     const MIN_AS_U128: u128 = 1 << 127;
     const MAX_AS_U128: u128 = 0x7fffffffffffffffffffffffffffffff;
@@ -22,14 +22,14 @@ module integer_mate::i128 {
     }
 
     public fun from(v: u128): I128 {
-        assert!(v <= MAX_AS_U128, error::invalid_argument(OVERFLOW));
+        assert!(v <= MAX_AS_U128, EOverflow);
         I128 {
             bits: v
         }
     }
 
     public fun neg_from(v: u128): I128 {
-        assert!(v <= MIN_AS_U128, error::invalid_argument(OVERFLOW));
+        assert!(v <= MIN_AS_U128, EOverflow);
         if (v == 0) {
             I128 {
                 bits: v
@@ -66,7 +66,7 @@ module integer_mate::i128 {
     public fun add(num1: I128, num2: I128): I128 {
         let sum = wrapping_add(num1, num2);
         let overflow = (sign(num1) & sign(num2) & u8_neg(sign(sum))) + (u8_neg(sign(num1)) & u8_neg(sign(num2)) & sign(sum));
-        assert!(overflow == 0, error::invalid_argument(OVERFLOW));
+        assert!(overflow == 0, EOverflow);
         sum
     }
 
@@ -119,7 +119,7 @@ module integer_mate::i128 {
         if (sign(v) == 0) {
             v
         } else {
-            assert!(v.bits > MIN_AS_U128, error::invalid_argument(OVERFLOW));
+            assert!(v.bits > MIN_AS_U128, EOverflow);
             I128 {
                 bits: u128_neg(v.bits - 1)
             }
@@ -167,6 +167,14 @@ module integer_mate::i128 {
         }
     }
 
+    public fun as_i32(v: I128): i32::I32 {
+        if (is_neg(v)) {
+            return i32::neg_from((abs_u128(v) as u32))
+        } else {
+            return i32::from((abs_u128(v) as u32))
+        }
+    }
+
     public fun sign(v: I128): u8 {
         ((v.bits >> 127) as u8)
     }