Merge pull request #3380 from Sifchain/fix/halborn-audit

Fix/halborn audit

Author: khdegraaf

x/clp/keeper/calculations.go

@@ -138,7 +138,7 @@ func CalculatePoolUnits(P, R, A, r, a sdk.Uint, sellNativeSwapFeeRate, buyNative
 		// we'll default to doing the same thing.
 
 		if a.IsZero() || r.IsZero() {
-			return sdk.Uint{}, sdk.Uint{}, 0, sdk.Uint{}, types.ErrInValidAmount
+			return sdk.Uint{}, sdk.Uint{}, NoSwap, sdk.Uint{}, types.ErrInValidAmount
 		}
 
 		return r, r, NoSwap, sdk.Uint{}, nil

x/clp/types/keys.go

@@ -63,7 +63,7 @@ func GetLiquidityProviderKey(externalTicker string, lp string) []byte {
 
 func GetDefaultRewardParams() *RewardParams {
 	return &RewardParams{
-		LiquidityRemovalLockPeriod:   0,
+		LiquidityRemovalLockPeriod:   0, // set to zero since it's now only used when starting a new chain e.g. localnet
 		LiquidityRemovalCancelPeriod: 12 * 60 * 24 * 30,
 		RewardPeriods:                nil,
 		RewardPeriodStartTime:        "",