Merge pull request #28 from Cardinal-Cryptography/add-u256

Cardinal-Cryptography · Sep 14, 2023 · fd02f79 · fd02f79
2 parents 2d6fd06 + d7da368
commit fd02f79
Show file tree

Hide file tree

Showing 21 changed files with 1,470 additions and 154 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,4 +4,4 @@ resolver = "2"
 
 members = ["amm/contracts/**", "farm/contracts"]
 
-exclude = ["e2e-tests", "amm/logics"]
+exclude = ["e2e-tests", "amm/logics", "helpers"]
diff --git a/amm/contracts/pair/Cargo.toml b/amm/contracts/pair/Cargo.toml
@@ -19,6 +19,7 @@ openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag =
     "reentrancy_guard",
 ] }
 amm = { path = "../../logics", default-features = false }
+amm-helpers = { path = "../../../helpers", default-features = false }
 primitive-types = { version = "0.11.1", default-features = false, features = [
     "codec",
 ] }
@@ -31,5 +32,12 @@ doctest = false
 
 [features]
 default = ["std"]
-std = ["ink/std", "scale/std", "scale-info/std", "openbrush/std", "amm/std"]
+std = [
+    "ink/std",
+    "scale/std",
+    "scale-info/std",
+    "openbrush/std",
+    "amm/std",
+    "amm-helpers/std",
+]
 ink-as-dependency = []
diff --git a/amm/contracts/pair/lib.rs b/amm/contracts/pair/lib.rs
@@ -6,7 +6,6 @@ pub mod pair {
     use amm::{
         ensure,
         helpers::{
-            math::casted_mul,
             transfer_helper::safe_transfer,
             ZERO_ADDRESS,
         },
@@ -17,10 +16,11 @@ pub mod pair {
             },
             *,
         },
-        traits::{
-            pair::*,
-            types::WrappedU256,
-        },
+        traits::pair::*,
+    };
+    use amm_helpers::{
+        math::casted_mul,
+        types::WrappedU256,
     };
     use ink::{
         codegen::{

diff --git a/amm/logics/Cargo.lock b/amm/logics/Cargo.lock
diff --git a/amm/logics/Cargo.toml b/amm/logics/Cargo.toml
@@ -24,6 +24,7 @@ primitive-types = { version = "0.11.1", default-features = false, features = [
     "codec",
 ] }
 sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" }
+amm-helpers = { path = "../../helpers", default-features = false }
 
 [dev-dependencies]
 curve25519-dalek = { version = "4.0.0-rc.2", features = ["digest"] }
@@ -46,4 +47,5 @@ std = [
     "primitive-types/std",
     "primitive-types/scale-info",
     "sp-arithmetic/std",
+    "amm-helpers/std",
 ]
diff --git a/amm/logics/helpers/helper.rs b/amm/logics/helpers/helper.rs
@@ -1,13 +1,11 @@
-use crate::{
-    helpers::math::casted_mul,
-    traits::{
-        factory::{
-            Factory,
-            FactoryRef,
-        },
-        pair::PairRef,
+use crate::traits::{
+    factory::{
+        Factory,
+        FactoryRef,
     },
+    pair::PairRef,
 };
+use amm_helpers::math::casted_mul;
 use ink::prelude::vec::Vec;
 use openbrush::traits::{
     AccountId,

diff --git a/amm/logics/helpers/math.rs b/amm/logics/helpers/math.rs
diff --git a/amm/logics/helpers/mod.rs b/amm/logics/helpers/mod.rs
@@ -1,5 +1,4 @@
 pub mod helper;
-pub mod math;
 pub mod transfer_helper;
 
 /// Zero address for which the private key is unknown.

diff --git a/amm/logics/impls/pair/data.rs b/amm/logics/impls/pair/data.rs
@@ -1,7 +1,5 @@
-use crate::{
-    helpers::ZERO_ADDRESS,
-    traits::types::WrappedU256,
-};
+use crate::helpers::ZERO_ADDRESS;
+use amm_helpers::types::WrappedU256;
 use openbrush::traits::{
     AccountId,
     Balance,

diff --git a/amm/logics/impls/pair/pair.rs b/amm/logics/impls/pair/pair.rs
@@ -1,18 +1,18 @@
 use crate::{
     ensure,
-    helpers::math::casted_mul,
-    traits::{
-        factory::{
-            Factory,
-            FactoryRef,
-        },
-        types::WrappedU256,
+    traits::factory::{
+        Factory,
+        FactoryRef,
     },
 };
 pub use crate::{
     impls::pair::*,
     traits::pair::*,
 };
+use amm_helpers::{
+    math::casted_mul,
+    types::WrappedU256,
+};
 use openbrush::{
     contracts::psp22::*,
     traits::{

diff --git a/amm/logics/traits/mod.rs b/amm/logics/traits/mod.rs
@@ -1,5 +1,4 @@
 pub mod factory;
 pub mod pair;
 pub mod router;
-pub mod types;
 pub mod wnative;
diff --git a/amm/logics/traits/pair.rs b/amm/logics/traits/pair.rs
@@ -14,7 +14,7 @@ use openbrush::{
     },
 };
 
-use super::types::WrappedU256;
+use amm_helpers::types::WrappedU256;
 
 #[openbrush::wrapper]
 pub type PairRef = dyn Pair;

diff --git a/farm/contracts/Cargo.toml b/farm/contracts/Cargo.toml
@@ -15,13 +15,12 @@ scale-info = { version = "2.3", default-features = false, features = [
 ], optional = true }
 
 openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.0", default-features = false }
-primitive-types = { version = "=0.12.1", default-features = false, features = [
+primitive-types = { version = "0.11.1", default-features = false, features = [
     "codec",
 ] }
 sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.37" }
-
 psp22-traits = { path = "../psp22-traits", default-features = false }
-
+amm-helpers = { path = "../../helpers", default-features = false }
 [lib]
 path = "lib.rs"
 
@@ -36,5 +35,6 @@ std = [
     "primitive-types/std",
     "primitive-types/scale-info",
     "sp-arithmetic/std",
+    "amm-helpers/std",
 ]
 ink-as-dependency = []