Merge branch 'feat/relayer' of https://github.com/oraichain/oraiswap into fix/orderbook-market-order-bug

Author: ducphamle2

contracts/oraiswap_limit_order/src/contract.rs

@@ -605,11 +605,15 @@ pub fn query_contract_info(deps: Deps) -> StdResult<ContractInfoResponse> {
         admin: deps.api.addr_humanize(&info.admin)?,
         commission_rate: info.commission_rate,
         reward_address: deps.api.addr_humanize(&info.reward_address)?,
+        operator: if let Some(operator) = info.operator {
+            Some(deps.api.addr_humanize(&operator)?)
+        } else {
+            None
+        },
     })
 }
 
 #[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> StdResult<Response> {
-    store_config(deps.storage, &msg.new_config)?;
+pub fn migrate(_deps: DepsMut, _env: Env, _msg: MigrateMsg) -> StdResult<Response> {
     Ok(Response::default())
 }

contracts/oraiswap_limit_order/src/testing/migrate_test.rs

@@ -0,0 +1,39 @@
+use cosmwasm_schema::cw_serde;
+use cosmwasm_std::{testing::mock_dependencies, Api, CanonicalAddr, StdResult, Storage};
+use cosmwasm_storage::singleton;
+
+use crate::state::read_config;
+
+#[cw_serde]
+pub struct ContractInfoOld {
+    pub name: String,
+    pub version: String,
+    // admin can update the parameter, may be multisig
+    pub admin: CanonicalAddr,
+    pub commission_rate: String,
+    pub reward_address: CanonicalAddr,
+}
+
+static CONTRACT_INFO: &[u8] = b"contract_info"; // contract info
+
+pub fn store_config_old(storage: &mut dyn Storage, config: &ContractInfoOld) -> StdResult<()> {
+    singleton(storage, CONTRACT_INFO).save(config)
+}
+
+#[test]
+fn test_migrate_contract_info() {
+    // fixture
+    let mut deps = mock_dependencies();
+    let contract_info = ContractInfoOld {
+        name: "foo".to_string(),
+        version: "1".to_string(),
+        admin: deps.api.addr_canonicalize("admin").unwrap(),
+        commission_rate: "1".to_string(),
+        reward_address: deps.api.addr_canonicalize("reward").unwrap(),
+    };
+    store_config_old(deps.as_mut().storage, &contract_info).unwrap();
+
+    let config = read_config(deps.as_ref().storage).unwrap();
+    assert_eq!(config.name, "foo".to_string());
+    assert_eq!(config.operator, None);
+}

contracts/oraiswap_limit_order/src/testing/mod.rs

@@ -1,4 +1,5 @@
 mod contract_test;
+mod migrate_test;
 mod orderbook_test;
 
 #[macro_export]

packages/oraiswap/src/limit_order.rs

@@ -224,6 +224,7 @@ pub struct ContractInfoResponse {
     pub admin: Addr,
     pub commission_rate: String,
     pub reward_address: Addr,
+    pub operator: Option<Addr>,
 }
 
 #[cw_serde]
@@ -285,6 +286,4 @@ pub struct BaseAmountResponse {
 
 /// We currently take no arguments for migrations
 #[cw_serde]
-pub struct MigrateMsg {
-    pub new_config: ContractInfo,
-}
+pub struct MigrateMsg {}