Merge pull request #72 from oraidex/hotfix/migrate-factory-msg

chore: hotfix factory migrate msg
oraidex · Dec 25, 2024 · 700daad · 700daad
2 parents 3cededc + 824a6b6
commit 700daad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/contracts/oraiswap_factory/src/contract.rs b/contracts/oraiswap_factory/src/contract.rs
@@ -439,7 +439,6 @@ pub fn query_pairs(
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> StdResult<Response> {
-    let old_config = CONFIG.load(deps.storage)?;
     let config = Config {
         oracle_addr: deps.api.addr_canonicalize(msg.oracle_addr.as_str())?,
         owner: deps.api.addr_canonicalize(msg.owner.as_str())?,
@@ -449,11 +448,7 @@ pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> StdResult<Response>
             .commission_rate
             .unwrap_or(DEFAULT_COMMISSION_RATE.to_string()),
         operator_fee: msg.operator_fee.unwrap_or(DEFAULT_OPERATOR_FEE.to_string()),
-        operator: deps.api.addr_canonicalize(
-            msg.operator
-                .unwrap_or(old_config.owner.to_string())
-                .as_str(),
-        )?,
+        operator: deps.api.addr_canonicalize(&msg.operator)?,
     };
 
     CONFIG.save(deps.storage, &config)?;

diff --git a/packages/oraiswap/src/factory.rs b/packages/oraiswap/src/factory.rs
@@ -79,7 +79,7 @@ pub struct MigrateMsg {
     pub oracle_addr: Addr,
     pub commission_rate: Option<String>,
     pub operator_fee: Option<String>,
-    pub operator: Option<String>,
+    pub operator: String,
 }
 
 // We define a custom struct for each query response