Merge pull request #23 from Cardinal-Cryptography/rm-uniswap

Cardinal-Cryptography · Sep 11, 2023 · 21c9b42 · 21c9b42
2 parents b9b9d72 + 7314b47
commit 21c9b42
Show file tree

Hide file tree

Showing 40 changed files with 93 additions and 100 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,4 @@
 [workspace]
-members = ["uniswap-v2/contracts/**", "farm/contracts"]
+members = ["amm/contracts/**", "farm/contracts"]
 
-exclude = ["e2e-tests", "uniswap-v2/logics"]
+exclude = ["e2e-tests", "amm/logics"]
diff --git a/Makefile b/Makefile
@@ -34,7 +34,7 @@ build-node-arm64:
 build-node-x86_64:
 	@docker buildx build --pull --platform linux/amd64 -t aleph-onenode-chain-x86_64 --load docker
 
-UNI_CONTRACTS = ./uniswap-v2/contracts
+UNI_CONTRACTS = ./amm/contracts
 UNI_CONTRACTS_PATHS := $(shell find $(UNI_CONTRACTS) -mindepth 1 -maxdepth 1 -type d)
 
 FARM_CONTRACTS = ./farm

diff --git a/uniswap-v2/contracts/factory/Cargo.toml → amm/contracts/factory/Cargo.toml b/uniswap-v2/contracts/factory/Cargo.toml → amm/contracts/factory/Cargo.toml
@@ -18,7 +18,7 @@ pair_contract = { path = "../pair", default-features = false, features = [
     "ink-as-dependency",
 ] }
 openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false }
-uniswap_v2 = { path = "../../logics", default-features = false }
+amm = { path = "../../logics", default-features = false }
 
 [lib]
 name = "factory_contract"
@@ -31,7 +31,7 @@ std = [
     "scale/std",
     "scale-info/std",
     "openbrush/std",
-    "uniswap_v2/std",
+    "amm/std",
     "pair_contract/std",
 ]
 ink-as-dependency = []

diff --git a/uniswap-v2/contracts/factory/lib.rs → amm/contracts/factory/lib.rs b/uniswap-v2/contracts/factory/lib.rs → amm/contracts/factory/lib.rs
@@ -3,6 +3,17 @@
 
 #[openbrush::contract]
 pub mod factory {
+    use amm::{
+        ensure,
+        impls::factory::{
+            factory::{
+                only_fee_setter,
+                Internal,
+            },
+            *,
+        },
+        traits::factory::*,
+    };
     use ink::{
         codegen::{
             EmitEvent,
@@ -19,17 +30,6 @@ pub mod factory {
         },
     };
     use pair_contract::pair::PairContractRef;
-    use uniswap_v2::{
-        ensure,
-        impls::factory::{
-            factory::{
-                only_fee_setter,
-                Internal,
-            },
-            *,
-        },
-        traits::factory::*,
-    };
 
     #[ink(event)]
     pub struct PairCreated {
@@ -202,10 +202,7 @@ pub mod factory {
         fn initialize_works() {
             let accounts = default_accounts::<ink::env::DefaultEnvironment>();
             let factory = FactoryContract::new(accounts.alice, Hash::default());
-            assert_eq!(
-                factory.factory.fee_to,
-                uniswap_v2::helpers::ZERO_ADDRESS.into()
-            );
+            assert_eq!(factory.factory.fee_to, amm::helpers::ZERO_ADDRESS.into());
         }
     }
 }
diff --git a/uniswap-v2/contracts/pair/Cargo.toml → amm/contracts/pair/Cargo.toml b/uniswap-v2/contracts/pair/Cargo.toml → amm/contracts/pair/Cargo.toml
@@ -18,7 +18,7 @@ openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag =
     "psp22",
     "reentrancy_guard",
 ] }
-uniswap_v2 = { path = "../../logics", default-features = false }
+amm = { path = "../../logics", default-features = false }
 primitive-types = { version = "0.11.1", default-features = false, features = [
     "codec",
 ] }
@@ -31,13 +31,7 @@ doctest = false
 
 [features]
 default = ["std"]
-std = [
-    "ink/std",
-    "scale/std",
-    "scale-info/std",
-    "openbrush/std",
-    "uniswap_v2/std",
-]
+std = ["ink/std", "scale/std", "scale-info/std", "openbrush/std", "amm/std"]
 ink-as-dependency = []
 
 [profile.dev]

diff --git a/uniswap-v2/contracts/pair/lib.rs → amm/contracts/pair/lib.rs b/uniswap-v2/contracts/pair/lib.rs → amm/contracts/pair/lib.rs
@@ -3,23 +3,7 @@
 
 #[openbrush::contract]
 pub mod pair {
-    use ink::{
-        codegen::{
-            EmitEvent,
-            Env,
-        },
-        prelude::vec::Vec,
-    };
-    use openbrush::{
-        contracts::{
-            psp22::*,
-            reentrancy_guard::*,
-        },
-        modifiers,
-        traits::Storage,
-    };
-    use sp_arithmetic::traits::IntegerSquareRoot;
-    use uniswap_v2::{
+    use amm::{
         ensure,
         helpers::{
             math::casted_mul,
@@ -38,6 +22,22 @@ pub mod pair {
             types::WrappedU256,
         },
     };
+    use ink::{
+        codegen::{
+            EmitEvent,
+            Env,
+        },
+        prelude::vec::Vec,
+    };
+    use openbrush::{
+        contracts::{
+            psp22::*,
+            reentrancy_guard::*,
+        },
+        modifiers,
+        traits::Storage,
+    };
+    use sp_arithmetic::traits::IntegerSquareRoot;
 
     #[ink(event)]
     pub struct Mint {

diff --git a/uniswap-v2/contracts/psp22/Cargo.toml → amm/contracts/psp22/Cargo.toml b/uniswap-v2/contracts/psp22/Cargo.toml → amm/contracts/psp22/Cargo.toml
diff --git a/uniswap-v2/contracts/psp22/lib.rs → amm/contracts/psp22/lib.rs b/uniswap-v2/contracts/psp22/lib.rs → amm/contracts/psp22/lib.rs
diff --git a/uniswap-v2/contracts/router/Cargo.toml → amm/contracts/router/Cargo.toml b/uniswap-v2/contracts/router/Cargo.toml → amm/contracts/router/Cargo.toml
@@ -20,7 +20,7 @@ scale-info = { version = "2.3", default-features = false, features = [
 openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false, features = [
     "psp22",
 ] }
-uniswap_v2 = { path = "../../logics", default-features = false }
+amm = { path = "../../logics", default-features = false }
 
 [lib]
 name = "router_contract"
@@ -34,7 +34,7 @@ std = [
     "scale-info",
     "scale-info/std",
     "openbrush/std",
-    "uniswap_v2/std",
+    "amm/std",
 ]
 ink-as-dependency = []
 

diff --git a/uniswap-v2/contracts/router/lib.rs → amm/contracts/router/lib.rs b/uniswap-v2/contracts/router/lib.rs → amm/contracts/router/lib.rs
@@ -3,16 +3,7 @@
 
 #[openbrush::contract]
 pub mod router {
-    use ink::{
-        codegen::Env,
-        env::CallFlags,
-        prelude::vec::Vec,
-    };
-    use openbrush::{
-        modifiers,
-        traits::Storage,
-    };
-    use uniswap_v2::{
+    use amm::{
         ensure,
         helpers::{
             helper::*,
@@ -30,6 +21,15 @@ pub mod router {
             router::*,
         },
     };
+    use ink::{
+        codegen::Env,
+        env::CallFlags,
+        prelude::vec::Vec,
+    };
+    use openbrush::{
+        modifiers,
+        traits::Storage,
+    };
 
     #[ink(storage)]
     #[derive(Default, Storage)]

diff --git a/uniswap-v2/contracts/wnative/Cargo.toml → amm/contracts/wnative/Cargo.toml b/uniswap-v2/contracts/wnative/Cargo.toml → amm/contracts/wnative/Cargo.toml
@@ -17,7 +17,7 @@ scale-info = { version = "2.3", default-features = false, features = [
 openbrush = { git = "https://github.com/727-Ventures/openbrush-contracts", tag = "3.1.1", default-features = false, features = [
     "psp22",
 ] }
-uniswap_v2 = { path = "../../logics", default-features = false }
+amm = { path = "../../logics", default-features = false }
 
 [lib]
 name = "wnative_contract"
@@ -31,7 +31,7 @@ std = [
     "scale-info",
     "scale-info/std",
     "openbrush/std",
-    "uniswap_v2/std",
+    "amm/std",
 ]
 ink-as-dependency = []
 

diff --git a/uniswap-v2/contracts/wnative/lib.rs → amm/contracts/wnative/lib.rs b/uniswap-v2/contracts/wnative/lib.rs → amm/contracts/wnative/lib.rs
@@ -3,6 +3,10 @@
 
 #[openbrush::contract]
 pub mod wnative {
+    use amm::traits::wnative::{
+        wnative_external,
+        Wnative,
+    };
     use ink::{
         codegen::{
             EmitEvent,
@@ -17,10 +21,6 @@ pub mod wnative {
             String,
         },
     };
-    use uniswap_v2::traits::wnative::{
-        wnative_external,
-        Wnative,
-    };
 
     #[ink(event)]
     pub struct Transfer {

diff --git a/uniswap-v2/logics/Cargo.lock → amm/logics/Cargo.lock b/uniswap-v2/logics/Cargo.lock → amm/logics/Cargo.lock
diff --git a/uniswap-v2/logics/Cargo.toml → amm/logics/Cargo.toml b/uniswap-v2/logics/Cargo.toml → amm/logics/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "uniswap_v2"
+name = "amm"
 version = "0.2.0"
 authors = ["Cardinal Cryptography"]
 edition = "2021"
@@ -30,7 +30,7 @@ curve25519-dalek = { version = "4.0.0-rc.2", features = ["digest"] }
 sha2 = "0.10.6"
 
 [lib]
-name = "uniswap_v2"
+name = "amm"
 path = "lib.rs"
 crate-type = ["rlib"]
 

diff --git a/uniswap-v2/logics/helpers/helper.rs → amm/logics/helpers/helper.rs b/uniswap-v2/logics/helpers/helper.rs → amm/logics/helpers/helper.rs
diff --git a/uniswap-v2/logics/helpers/math.rs → amm/logics/helpers/math.rs b/uniswap-v2/logics/helpers/math.rs → amm/logics/helpers/math.rs
diff --git a/uniswap-v2/logics/helpers/mod.rs → amm/logics/helpers/mod.rs b/uniswap-v2/logics/helpers/mod.rs → amm/logics/helpers/mod.rs
diff --git a/uniswap-v2/logics/helpers/transfer_helper.rs → amm/logics/helpers/transfer_helper.rs b/uniswap-v2/logics/helpers/transfer_helper.rs → amm/logics/helpers/transfer_helper.rs
diff --git a/uniswap-v2/logics/impls/factory/data.rs → amm/logics/impls/factory/data.rs b/uniswap-v2/logics/impls/factory/data.rs → amm/logics/impls/factory/data.rs
diff --git a/uniswap-v2/logics/impls/factory/factory.rs → amm/logics/impls/factory/factory.rs b/uniswap-v2/logics/impls/factory/factory.rs → amm/logics/impls/factory/factory.rs
diff --git a/uniswap-v2/logics/impls/factory/mod.rs → amm/logics/impls/factory/mod.rs b/uniswap-v2/logics/impls/factory/mod.rs → amm/logics/impls/factory/mod.rs
diff --git a/uniswap-v2/logics/impls/mod.rs → amm/logics/impls/mod.rs b/uniswap-v2/logics/impls/mod.rs → amm/logics/impls/mod.rs
diff --git a/uniswap-v2/logics/impls/pair/data.rs → amm/logics/impls/pair/data.rs b/uniswap-v2/logics/impls/pair/data.rs → amm/logics/impls/pair/data.rs
diff --git a/uniswap-v2/logics/impls/pair/mod.rs → amm/logics/impls/pair/mod.rs b/uniswap-v2/logics/impls/pair/mod.rs → amm/logics/impls/pair/mod.rs
diff --git a/uniswap-v2/logics/impls/pair/pair.rs → amm/logics/impls/pair/pair.rs b/uniswap-v2/logics/impls/pair/pair.rs → amm/logics/impls/pair/pair.rs
diff --git a/uniswap-v2/logics/impls/router/data.rs → amm/logics/impls/router/data.rs b/uniswap-v2/logics/impls/router/data.rs → amm/logics/impls/router/data.rs
diff --git a/uniswap-v2/logics/impls/router/mod.rs → amm/logics/impls/router/mod.rs b/uniswap-v2/logics/impls/router/mod.rs → amm/logics/impls/router/mod.rs
diff --git a/uniswap-v2/logics/impls/router/router.rs → amm/logics/impls/router/router.rs b/uniswap-v2/logics/impls/router/router.rs → amm/logics/impls/router/router.rs
diff --git a/uniswap-v2/logics/lib.rs → amm/logics/lib.rs b/uniswap-v2/logics/lib.rs → amm/logics/lib.rs
diff --git a/uniswap-v2/logics/traits/factory.rs → amm/logics/traits/factory.rs b/uniswap-v2/logics/traits/factory.rs → amm/logics/traits/factory.rs
diff --git a/uniswap-v2/logics/traits/mod.rs → amm/logics/traits/mod.rs b/uniswap-v2/logics/traits/mod.rs → amm/logics/traits/mod.rs
diff --git a/uniswap-v2/logics/traits/pair.rs → amm/logics/traits/pair.rs b/uniswap-v2/logics/traits/pair.rs → amm/logics/traits/pair.rs
diff --git a/uniswap-v2/logics/traits/router.rs → amm/logics/traits/router.rs b/uniswap-v2/logics/traits/router.rs → amm/logics/traits/router.rs
diff --git a/uniswap-v2/logics/traits/types.rs → amm/logics/traits/types.rs b/uniswap-v2/logics/traits/types.rs → amm/logics/traits/types.rs
diff --git a/uniswap-v2/logics/traits/wnative.rs → amm/logics/traits/wnative.rs b/uniswap-v2/logics/traits/wnative.rs → amm/logics/traits/wnative.rs