Merge pull request #12 from memechan-gg/fix/unstake

🔧 fix: unstake fn
memechan-gg · May 8, 2024 · bcaa7f3 · bcaa7f3
2 parents 0122ce3 + 725940b
commit bcaa7f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/memechan/sources/live_phase/go_live.move b/memechan/sources/live_phase/go_live.move
@@ -189,7 +189,7 @@ module memechan::go_live {
         );
 
         let pool_id = object::id(&amm_pool);
-
+        
         // 4. Create staking pool
         let staking_pool = staking_pool::new<S, Meme, LP>(
             pool_id,

diff --git a/memechan/sources/live_phase/staking_pool.move b/memechan/sources/live_phase/staking_pool.move
@@ -4,7 +4,6 @@ module memechan::staking_pool {
     use sui::balance::Balance;
     use sui::token::{Self, Token, TokenPolicy, TokenPolicyCap};
     use sui::clock::{Self, Clock};
-    use sui::balance;
     use sui::coin::{Self, Coin, TreasuryCap};
     use sui::tx_context::{sender, TxContext};
 
@@ -24,7 +23,6 @@ module memechan::staking_pool {
     struct StakingPool<phantom S, phantom Meme, phantom LP> has key, store {
         id: UID,
         amm_pool: ID,
-        balance_meme: Balance<Meme>,
         balance_lp: Balance<LP>,
         vesting_table: Table<address, VestingData>,
         meme_cap: TreasuryCap<Meme>,
@@ -48,7 +46,6 @@ module memechan::staking_pool {
         let staking_pool = StakingPool {
             id: object::new(ctx),
             amm_pool,
-            balance_meme: balance::zero(),
             balance_lp,
             meme_cap,
             policy_cap,
@@ -94,15 +91,11 @@ module memechan::staking_pool {
 
         vesting::release(vesting_data, release_amount);
 
-        coin::burn(
-            &mut staking_pool.meme_cap,
-            token_ir::to_coin(policy, coin_x, ctx),
-        );
-
-        balance::join(&mut balance_meme, balance::split(&mut staking_pool.balance_meme, release_amount));
+        let coin_m = coin::from_balance(balance_meme, ctx);
+        coin::join(&mut coin_m, token_ir::to_coin(policy, coin_x, ctx));
 
         (
-            coin::from_balance(balance_meme, ctx),
+            coin_m,
             coin::from_balance(balance_sui, ctx)
         )
     }