Merge pull request #48 from oraichain/feat/change-limit-order-to-orde…

…rbook change to oraiswap_orderbook
oraichain · Mar 18, 2024 · b6594f7 · b6594f7
2 parents fc9c351 + 4eae061
commit b6594f7
Show file tree

Hide file tree

Showing 18 changed files with 282 additions and 311 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -4,57 +4,43 @@ Uniswap-inspired automated market-maker (AMM) protocol powered by Smart Contract
 
 ## Contracts
 
-| Name                                                     | Description                                              |
-| -------------------------------------------------------- | -------------------------------------------------------- |
-| [`oraiswap_factory`](contracts/oraiswap_factory)         | Proxy contract to create oraiswap_pair instance          |
-| [`oraiswap_oracle`](contracts/oraiswap_oracle)           | Global parameters updated by multisig wallet             |
-| [`oraiswap_pair`](contracts/oraiswap_pair)               | Logic for building liquidity pool and trade between pair |
-| [`oraiswap_router`](contracts/oraiswap_router)           | Facilitate multi-hop swap operations                     |
-| [`oraiswap_limit_order`](contracts/oraiswap_limit_order) | Orderbook implementation                                 |
-| [`oraiswap_staking`](contracts/oraiswap_staking)         | Stake LPs to get ORAIX reward                            |
-| [`oraiswap_token`](contracts/oraiswap_token)             | (ERC20 equivalent) token implementation, AIRI, ORAIX     |
+| Name                                                 | Description                                              |
+| ---------------------------------------------------- | -------------------------------------------------------- |
+| [`oraiswap_factory`](contracts/oraiswap_factory)     | Proxy contract to create oraiswap_pair instance          |
+| [`oraiswap_oracle`](contracts/oraiswap_oracle)       | Global parameters updated by multisig wallet             |
+| [`oraiswap_pair`](contracts/oraiswap_pair)           | Logic for building liquidity pool and trade between pair |
+| [`oraiswap_router`](contracts/oraiswap_router)       | Facilitate multi-hop swap operations                     |
+| [`oraiswap_orderbook`](contracts/oraiswap_orderbook) | Orderbook implementation                                 |
+| [`oraiswap_staking`](contracts/oraiswap_staking)     | Stake LPs to get ORAIX reward                            |
+| [`oraiswap_token`](contracts/oraiswap_token)         | (ERC20 equivalent) token implementation, AIRI, ORAIX     |
 
 - oraiswap_factory
 
-  Mainnet: `orai1ulgw0td86nvs4wtpsc80thv6xelk76ut7a7apj`
-
-  Testnet: `orai18qpjm4zkvqnpjpw0zn0tdr8gdzvt8au35v45xf`
+  Mainnet: [`orai167r4ut7avvgpp3rlzksz6vw5spmykluzagvmj3ht845fjschwugqjsqhst`](https://scan.orai.io/smart-contract/orai167r4ut7avvgpp3rlzksz6vw5spmykluzagvmj3ht845fjschwugqjsqhst)
 
 - oraiswap_oracle
 
-  Mainnet: `orai1ulgw0td86nvs4wtpsc80thv6xelk76ut7a7apj`
-
-  Testnet: `orai18qpjm4zkvqnpjpw0zn0tdr8gdzvt8au35v45xf`
+  Mainnet: [`orai18rgtdvlrev60plvucw2rz8nmj8pau9gst4q07m`](https://scan.orai.io/smart-contract/orai18rgtdvlrev60plvucw2rz8nmj8pau9gst4q07m)
 
 - oraiswap_pair
 
-  Mainnet (CodeID): 4
-
-  Testnet (CodeID): 7869
+  Mainnet (CodeID): 1502
 
 - oraiswap_route
 
-  Mainnet: `orai1ulgw0td86nvs4wtpsc80thv6xelk76ut7a7apj`
+  Mainnet: [`orai1j0r67r9k8t34pnhy00x3ftuxuwg0r6r4p8p6rrc8az0ednzr8y9s3sj2sf`](https://scan.orai.io/smart-contract/orai1j0r67r9k8t34pnhy00x3ftuxuwg0r6r4p8p6rrc8az0ednzr8y9s3sj2sf)
 
-  Testnet: `orai18qpjm4zkvqnpjpw0zn0tdr8gdzvt8au35v45xf`
+- oraiswap_orderbook
 
-- oraiswap_limit_order
-
-  Mainnet: `orai1ulgw0td86nvs4wtpsc80thv6xelk76ut7a7apj`
-
-  Testnet: `orai18qpjm4zkvqnpjpw0zn0tdr8gdzvt8au35v45xf`
+  Mainnet: [`orai1nt58gcu4e63v7k55phnr3gaym9tvk3q4apqzqccjuwppgjuyjy6sxk8yzp`](https://scan.orai.io/smart-contract/orai1nt58gcu4e63v7k55phnr3gaym9tvk3q4apqzqccjuwppgjuyjy6sxk8yzp)
 
 - oraiswap_staking
 
-  Mainnet: `orai19p43y0tqnr5qlhfwnxft2u5unph5yn60y7tuvu`
-
-  Testnet: `orai1yzncqj7f8sculc3849w9hg9r4f4u79e3swnlr7`
+  Mainnet: [`orai19p43y0tqnr5qlhfwnxft2u5unph5yn60y7tuvu`](https://scan.orai.io/smart-contract/orai19p43y0tqnr5qlhfwnxft2u5unph5yn60y7tuvu)
 
 - oraiswap_token
 
-  Mainnet (CodeID): 3
-
-  Testnet (CodeID): 148
+  Mainnet (CodeID): 582
 
 ## Running this contract
 
@@ -88,13 +74,3 @@ impl ::std::convert::TryFrom<&[u8]> for MsgInstantiateContractResponse {
 }
 END
 ```
-
-## Code coverage
-
-```bash
-# install tarpaulin if needed
-cargo install cargo-tarpaulin --locked
-
-# Run code coverage for all contracts
-cargo tarpaulin --skip-clean --ignore-tests --exclude-files contracts/*/src/bin/schema.rs --frozen --engine llvm --out html --output-dir cov
-```
diff --git a/contracts/oraiswap_limit_order/Cargo.toml → contracts/oraiswap_orderbook/Cargo.toml b/contracts/oraiswap_limit_order/Cargo.toml → contracts/oraiswap_orderbook/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "oraiswap-limit-order"
+name = "oraiswap-orderbook"
 version = { workspace = true }
 authors = { workspace = true }
 edition = { workspace = true }

diff --git a/contracts/oraiswap_limit_order/README.md → contracts/oraiswap_orderbook/README.md b/contracts/oraiswap_limit_order/README.md → contracts/oraiswap_orderbook/README.md
@@ -45,7 +45,7 @@ Depends on the offer asset type
 
   ```
   MsgExecuteContract(
-      'limit_order_contract_addr',
+      'orderbook_contract_addr',
       [Coin('denom', 'amount')],
       base64(SubmitOrder {
           direction: OrderDirection::Buy,
@@ -61,7 +61,7 @@ Depends on the offer asset type
       'token_contract',
       [],
       base64(Send {
-          contract_addr: 'limit_order_contract_addr',
+          contract_addr: 'orderbook_contract_addr',
           amount: 'amount',
           msg: Some(base64(SubmitOrder {
               direction: OrderDirection::Buy,
@@ -75,7 +75,7 @@ Depends on the offer asset type
 
 ```
 MsgExecuteContract(
-    'limit_order_contract_addr',
+    'orderbook_contract_addr',
     [],
     base64(CancelOrder {
         order_id: u64,
@@ -93,7 +93,7 @@ Depends on the `ask asset`(= `execute asset`) type
 
   ```
   MsgExecuteContract(
-      'limit_order_contract_addr',
+      'orderbook_contract_addr',
       [Coin('denom', 'amount')],
       base64(ExecuteOrder {
        execute_asset: Asset,
@@ -108,7 +108,7 @@ Depends on the `ask asset`(= `execute asset`) type
       'token_contract',
       [],
       base64(Send {
-          contract_addr: 'limit_order_contract_addr',
+          contract_addr: 'orderbook_contract_addr',
           amount: 'amount',
           msg: Some(base64(ExecuteOrder {
               order_id: u64,

diff --git a/...ts/oraiswap_limit_order/src/bin/schema.rs → ...acts/oraiswap_orderbook/src/bin/schema.rs b/...ts/oraiswap_limit_order/src/bin/schema.rs → ...acts/oraiswap_orderbook/src/bin/schema.rs
@@ -1,6 +1,6 @@
 use cosmwasm_schema::write_api;
 
-use oraiswap::limit_order::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
+use oraiswap::orderbook::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 
 fn main() {
     write_api! {

diff --git a/...acts/oraiswap_limit_order/src/contract.rs → contracts/oraiswap_orderbook/src/contract.rs b/...acts/oraiswap_limit_order/src/contract.rs → contracts/oraiswap_orderbook/src/contract.rs
@@ -22,13 +22,13 @@ use crate::state::{
 
 use cw20::Cw20ReceiveMsg;
 use oraiswap::asset::{pair_key, Asset, AssetInfo};
-use oraiswap::limit_order::{
+use oraiswap::orderbook::{
     ContractInfo, ContractInfoResponse, Cw20HookMsg, ExecuteMsg, InstantiateMsg, MigrateMsg,
     OrderDirection, QueryMsg,
 };
 
 // version info for migration info
-const CONTRACT_NAME: &str = "crates.io:oraiswap_limit_order";
+const CONTRACT_NAME: &str = "crates.io:oraiswap_orderbook";
 const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
 
 // default commission rate = 0.1 %

diff --git a/contracts/oraiswap_limit_order/src/lib.rs → contracts/oraiswap_orderbook/src/lib.rs b/contracts/oraiswap_limit_order/src/lib.rs → contracts/oraiswap_orderbook/src/lib.rs
diff --git a/contracts/oraiswap_limit_order/src/order.rs → contracts/oraiswap_orderbook/src/order.rs b/contracts/oraiswap_limit_order/src/order.rs → contracts/oraiswap_orderbook/src/order.rs
@@ -14,7 +14,7 @@ use cosmwasm_std::{
 use cosmwasm_storage::ReadonlyBucket;
 use oraiswap::asset::{pair_key, Asset, AssetInfo};
 use oraiswap::error::ContractError;
-use oraiswap::limit_order::{OrderDirection, OrderStatus, Payment};
+use oraiswap::orderbook::{OrderDirection, OrderStatus, Payment};
 
 pub const RELAY_FEE: u128 = 300u128;
 pub const MIN_VOLUME: u128 = 10u128;

diff --git a/...cts/oraiswap_limit_order/src/orderbook.rs → ...racts/oraiswap_orderbook/src/orderbook.rs b/...cts/oraiswap_limit_order/src/orderbook.rs → ...racts/oraiswap_orderbook/src/orderbook.rs
@@ -4,7 +4,7 @@ use cosmwasm_schema::cw_serde;
 use cosmwasm_storage::ReadonlyBucket;
 use oraiswap::{
     asset::{pair_key_from_asset_keys, Asset, AssetInfo, AssetInfoRaw},
-    limit_order::{OrderBookResponse, OrderDirection, OrderResponse, OrderStatus},
+    orderbook::{OrderBookResponse, OrderDirection, OrderResponse, OrderStatus},
 };
 
 use cosmwasm_std::{Api, CanonicalAddr, Decimal, Order as OrderBy, StdResult, Storage, Uint128};

diff --git a/contracts/oraiswap_limit_order/src/query.rs → contracts/oraiswap_orderbook/src/query.rs b/contracts/oraiswap_limit_order/src/query.rs → contracts/oraiswap_orderbook/src/query.rs
@@ -7,13 +7,13 @@ use crate::state::{
 };
 use cosmwasm_std::{Decimal, Deps, Order as OrderBy, StdError, StdResult, Storage, Uint128};
 use oraiswap::error::ContractError;
-use oraiswap::limit_order::{OrderStatus, SimulateMarketOrderResponse};
+use oraiswap::orderbook::{OrderStatus, SimulateMarketOrderResponse};
 use std::convert::{TryFrom, TryInto};
 use std::str::FromStr;
 
 use oraiswap::asset::{pair_key, AssetInfo};
 use oraiswap::{
-    limit_order::{
+    orderbook::{
         LastOrderIdResponse, OrderBookResponse, OrderBooksResponse, OrderDirection, OrderFilter,
         OrderResponse, OrdersResponse, TickResponse, TicksResponse,
     },

diff --git a/contracts/oraiswap_limit_order/src/state.rs → contracts/oraiswap_orderbook/src/state.rs b/contracts/oraiswap_limit_order/src/state.rs → contracts/oraiswap_orderbook/src/state.rs
@@ -2,7 +2,7 @@ use cosmwasm_std::{Api, CanonicalAddr, Order as OrderBy, StdError, StdResult, St
 use cosmwasm_storage::{singleton, singleton_read, Bucket, ReadonlyBucket};
 use oraiswap::{
     error::ContractError,
-    limit_order::{ContractInfo, OrderDirection},
+    orderbook::{ContractInfo, OrderDirection},
     querier::calc_range_start,
 };
 use serde::{de::DeserializeOwned, Serialize};