Merge pull request #137 from apollodao/dev/fix-force-unlock-id

Dev/fix-force-unlock-id
apollodao · Feb 14, 2023 · 350d92f · 350d92f
2 parents 5fc880c + 0d32fa1
commit 350d92f
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cw-dex/Cargo.toml b/cw-dex/Cargo.toml
@@ -5,7 +5,8 @@ edition = "2021"
 license = "MPL-2.0"
 name = "cw-dex"
 repository = "https://github.com/apollodao/cw-dex"
-version = "0.1.0"
+version = "0.1.1"
+readme = "README.md"
 
 [features]
 default = []

diff --git a/cw-dex/README.md b/cw-dex/README.md
@@ -0,0 +1,10 @@
+# cw-dex
+CosmWasm abstractions for decentralized exchanges.
+
+This crate defines a set of
+traits to abstract out the common behavior of various decentralized exchanges so
+that the same contract code can be used to interact with any of them.
+
+The currently supported decentralized exchanges are:
+- [Osmosis](src/implementations/osmosis/)
+- [Astroport](src/implementations/astroport/)
diff --git a/cw-dex/src/implementations/osmosis/staking.rs b/cw-dex/src/implementations/osmosis/staking.rs
@@ -170,9 +170,16 @@ impl ForceUnlock for OsmosisStaking {
         &self,
         _deps: Deps,
         env: &Env,
-        lockup_id: u64,
+        lockup_id: Option<u64>,
         amount: Uint128,
     ) -> Result<Response, CwDexError> {
+        let lockup_id = match lockup_id {
+            Some(id) => Ok(id),
+            None => self
+                .lock_id
+                .ok_or_else(|| StdError::generic_err("osmosis error: lock id not set")),
+        }?;
+
         let coin_to_unlock = Coin::new(amount.u128(), self.lp_token_denom.clone());
 
         let force_unlock_msg = MsgForceUnlock {

diff --git a/cw-dex/src/traits/staking.rs b/cw-dex/src/traits/staking.rs
@@ -93,7 +93,7 @@ pub trait ForceUnlock: LockedStaking {
         &self,
         deps: Deps,
         env: &Env,
-        lockup_id: u64,
+        lockup_id: Option<u64>,
         amount: Uint128,
     ) -> Result<Response, CwDexError>;
 }
diff --git a/cw-dex/tests/osmosis_tests.rs b/cw-dex/tests/osmosis_tests.rs
@@ -298,7 +298,7 @@ mod tests {
         // Force unlock LP tokens
         let force_unlock_msg = ExecuteMsg::ForceUnlock {
             amount: unlock_amount,
-            lockup_id: 1,
+            lockup_id: Some(1),
         };
         runner.execute_cosmos_msgs::<MsgExecuteContractResponse>(
             &[force_unlock_msg.into_cosmos_msg(contract_addr.clone(), vec![])],

diff --git a/test-contracts/osmosis-test-contract/src/contract.rs b/test-contracts/osmosis-test-contract/src/contract.rs
@@ -133,7 +133,7 @@ pub fn execute_force_unlock(
     env: Env,
     _info: MessageInfo,
     amount: Uint128,
-    lockup_id: u64,
+    lockup_id: Option<u64>,
 ) -> Result<Response, ContractError> {
     let staking = STAKING.load(deps.storage)?;
 

diff --git a/test-contracts/package/src/msg.rs b/test-contracts/package/src/msg.rs
@@ -37,7 +37,7 @@ pub enum ExecuteMsg {
     },
     ForceUnlock {
         amount: Uint128,
-        lockup_id: u64,
+        lockup_id: Option<u64>,
     },
     Swap {
         offer: Asset,