Merge branch 'master' into feat/chain-initiator

Sifchain · Dec 13, 2023 · 8970c55 · 8970c55
2 parents 26c73f4 + 32352c8
commit 8970c55
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/integrationtest/output/tc1.json b/integrationtest/output/tc1.json
@@ -43,7 +43,7 @@
       },
       "liquidity_provider_units": "1000000000000000000000",
       "liquidity_provider_address": "sif1syavy2npfyt9tcncdtsdzf7kny9lh777yqc2nd",
-      "last_updated_block": 1,
+      "last_updated_block": 4,
       "reward_amount": null
     }
   }

diff --git a/x/clp/keeper/executors.go b/x/clp/keeper/executors.go
@@ -191,6 +191,8 @@ func (k Keeper) RemoveLiquidity(ctx sdk.Context, pool types.Pool, externalAssetC
 		k.DestroyLiquidityProvider(ctx, lp.Asset.Symbol, lp.LiquidityProviderAddress)
 	} else {
 		lp.LiquidityProviderUnits = lpUnitsLeft
+		// Set LP’s LastUpdatedBlock to current block height
+		lp.LastUpdatedBlock = ctx.BlockHeight()
 		k.SetLiquidityProvider(ctx, &lp)
 	}
 	return nil

diff --git a/x/clp/types/keys.go b/x/clp/types/keys.go
@@ -71,8 +71,8 @@ func GetLiquidityProviderKey(externalTicker string, lp string) []byte {
 
 func GetDefaultRewardParams() *RewardParams {
 	return &RewardParams{
-		LiquidityRemovalLockPeriod:   12 * 60 * 24 * 50, // 50 days
-		LiquidityRemovalCancelPeriod: 12 * 60 * 6,       // 6 hours
+		LiquidityRemovalLockPeriod:   12 * 60 * 5,       // 5 hours
+		LiquidityRemovalCancelPeriod: 12 * 60 * 24 * 50, // 50 days
 		RewardPeriods:                nil,
 		RewardPeriodStartTime:        "",
 		RewardsLockPeriod:            12 * 60 * 24 * 14, // 14 days