Merge pull request #5 from oraichain/single-step

Single step

Author: ducphamle2

.gitignore

@@ -1,9 +1,8 @@
-.earth
-.mars
 node_modules
 data
 build
 target
 libwasmvm_muslc.a
 tests/test-data.json
-artifacts
+artifacts
+.env

Cargo.toml

@@ -1,6 +1,8 @@
 [workspace]
 members = ["contracts/*"]
 
+resolver = "2"
+
 [profile.release]
 opt-level = 3
 debug = false

contracts/cw-ics20-latest/artifacts/cw-ics20-latest.wasm

@@ -443,13 +443,14 @@ pub fn execute_delete_mapping_pair(
 #[entry_point]
 pub fn migrate(deps: DepsMut, _env: Env, msg: MigrateMsg) -> Result<Response, ContractError> {
     // we don't need to save anything if migrating from the same version
+    let config: Config = CONFIG.load(deps.storage)?;
     CONFIG.save(
         deps.storage,
         &Config {
-            default_timeout: msg.default_timeout,
+            default_timeout: config.default_timeout,
             default_gas_limit: msg.default_gas_limit,
-            fee_denom: msg.fee_denom,
-            swap_router_contract: msg.swap_router_contract,
+            fee_denom: config.fee_denom,
+            swap_router_contract: config.swap_router_contract,
         },
     )?;
     set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
@@ -1089,9 +1090,9 @@ mod test {
             mock_env(),
             MigrateMsg {
                 default_gas_limit: Some(123456),
-                default_timeout: 100u64,
-                fee_denom: "orai".to_string(),
-                swap_router_contract: "foobar".to_string(),
+                // default_timeout: 100u64,
+                // fee_denom: "orai".to_string(),
+                // swap_router_contract: "foobar".to_string(),
             },
         )
         .unwrap();