refactor: dry swap

_deploy/p/gnoswap/pool/sqrt_price_math.gno

@@ -5,6 +5,8 @@ import (
 	u256 "gno.land/p/gnoswap/uint256"
 )
 
+const Q96_RESOLUTION = uint(96)
+
 func sqrtPriceMathGetNextSqrtPriceFromAmount0RoundingUp(
 	sqrtPX96 *u256.Uint, // uint160
 	liquidity *u256.Uint, // uint128
@@ -15,7 +17,7 @@ func sqrtPriceMathGetNextSqrtPriceFromAmount0RoundingUp(
 		return sqrtPX96
 	}
 
-	numerator1 := new(u256.Uint).Lsh(liquidity, 96)
+	numerator1 := new(u256.Uint).Lsh(liquidity, Q96_RESOLUTION)
 	product := new(u256.Uint).Mul(amount, sqrtPX96)
 
 	if add {
@@ -27,9 +29,9 @@ func sqrtPriceMathGetNextSqrtPriceFromAmount0RoundingUp(
 			}
 		}
 
-		div := new(u256.Uint).Div(numerator1, sqrtPX96)
-		add := new(u256.Uint).Add(div, amount)
-		return u256.DivRoundingUp(numerator1, add)
+		divValue := new(u256.Uint).Div(numerator1, sqrtPX96)
+		addValue := new(u256.Uint).Add(divValue, amount)
+		return u256.DivRoundingUp(numerator1, addValue)
 	} else {
 		cond1 := new(u256.Uint).Div(product, amount).Eq(sqrtPX96)
 		cond2 := numerator1.Gt(product)
@@ -53,24 +55,23 @@ func sqrtPriceMathGetNextSqrtPriceFromAmount1RoundingDown(
 
 	if add {
 		if amount.Lte(u256.MustFromDecimal(MAX_UINT160)) {
-			value1 := new(u256.Uint).Lsh(amount, 96)
-			quotient = new(u256.Uint).Div(value1, liquidity)
+			value := new(u256.Uint).Lsh(amount, Q96_RESOLUTION)
+			quotient = new(u256.Uint).Div(value, liquidity)
 		} else {
 			quotient = u256.MulDiv(amount, u256.MustFromDecimal(Q96), liquidity)
 		}
 
 		res := new(u256.Uint).Add(sqrtPX96, quotient)
-		max160 := u256.MustFromDecimal("1461501637330902918203684832716283019655932542975")
+		max160 := u256.MustFromDecimal(MAX_UINT160)
 
 		if res.Gt(max160) {
-			panic("sqrtPriceMathGetNextSqrtPriceFromAmount1RoundingDown sqrtPx96 + quotient overflow uint160")
+			panic("GetNextSqrtPriceFromAmount1RoundingDown sqrtPx96 + quotient overflow uint160")
 		}
 		return res
-
 	} else {
 		if amount.Lte(u256.MustFromDecimal(MAX_UINT160)) {
-			value1 := new(u256.Uint).Lsh(amount, 96)
-			quotient = u256.DivRoundingUp(value1, liquidity)
+			value := new(u256.Uint).Lsh(amount, Q96_RESOLUTION)
+			quotient = u256.DivRoundingUp(value, liquidity)
 		} else {
 			quotient = u256.MulDivRoundingUp(amount, u256.MustFromDecimal(Q96), liquidity)
 		}
@@ -134,19 +135,19 @@ func sqrtPriceMathGetAmount0DeltaHelper(
 		sqrtRatioAX96, sqrtRatioBX96 = sqrtRatioBX96, sqrtRatioAX96
 	}
 
-	numerator1 := new(u256.Uint).Lsh(liquidity, 96)
+	numerator1 := new(u256.Uint).Lsh(liquidity, Q96_RESOLUTION)
 	numerator2 := new(u256.Uint).Sub(sqrtRatioBX96, sqrtRatioAX96)
 
 	if !(sqrtRatioAX96.Gt(u256.Zero())) {
 		panic("pool_sqrt price math #3")
 	}
 
 	if roundUp {
-		value1 := u256.MulDivRoundingUp(numerator1, numerator2, sqrtRatioBX96)
-		return u256.DivRoundingUp(value1, sqrtRatioAX96)
+		value := u256.MulDivRoundingUp(numerator1, numerator2, sqrtRatioBX96)
+		return u256.DivRoundingUp(value, sqrtRatioAX96)
 	} else {
-		value1 := u256.MulDiv(numerator1, numerator2, sqrtRatioBX96)
-		return new(u256.Uint).Div(value1, sqrtRatioAX96)
+		value := u256.MulDiv(numerator1, numerator2, sqrtRatioBX96)
+		return new(u256.Uint).Div(value, sqrtRatioAX96)
 	}
 }
 

_deploy/r/gnoswap/common/tick_math.gno

@@ -43,34 +43,40 @@ var binaryLogConsts = [8]*u256.Uint{
 
 var (
 	shift1By32Left = u256.MustFromDecimal("4294967296") // (1 << 32)
+	maxTick        = int32(887272)
 )
 
 func TickMathGetSqrtRatioAtTick(tick int32) *u256.Uint { // uint160 sqrtPriceX96
 	absTick := abs(tick)
-	if absTick > 887272 { // MAX_TICK
+	if absTick > maxTick { // MAX_TICK
 		panic(addDetailToError(
 			errOutOfRange,
 			ufmt.Sprintf("tick_math.gno__TickMathGetSqrtRatioAtTick() || tick is out of range (larger than 887272), tick: %d", tick),
 		))
 	}
 
-	ratio := u256.MustFromDecimal("340282366920938463463374607431768211456") // consts.Q128
+	var initialBit int32 = 0x1
+	var ratio *u256.Uint
+	if (absTick & initialBit) != 0 {
+		ratio = tickRatioMap[initialBit]
+	} else {
+		ratio = u256.MustFromDecimal("340282366920938463463374607431768211456") // consts.Q128
+	}
 
 	for mask, value := range tickRatioMap {
-		if absTick&mask != 0 {
+		if (mask != initialBit) && absTick&mask != 0 {
 			// ratio = (ratio * value) >> 128
 			ratio = ratio.Mul(ratio, value)
 			ratio = ratio.Rsh(ratio, 128)
 		}
 	}
 
 	if tick > 0 {
-		_maxUint256 := u256.MustFromDecimal("115792089237316195423570985008687907853269984665640564039457584007913129639935") // consts.MAX_UINT256
-		_tmp := new(u256.Uint).Div(_maxUint256, ratio)
-		ratio = _tmp.Clone()
+		maxUint256 := u256.MustFromDecimal("115792089237316195423570985008687907853269984665640564039457584007913129639935") // consts.MAX_UINT256
+		ratio = new(u256.Uint).Div(maxUint256, ratio)
 	}
 
-	shifted := ratio.Rsh(ratio, 32).Clone()       // ratio >> 32
+	shifted := new(u256.Uint).Rsh(ratio, 32)      // ratio >> 32
 	remainder := ratio.Mod(ratio, shift1By32Left) // ratio % (1 << 32)
 
 	var adj *u256.Uint

_deploy/r/gnoswap/consts/consts.gno

@@ -90,9 +90,8 @@ const (
 	UINT64_MAX uint64 = 18446744073709551615
 
 	MAX_UINT128 string = "340282366920938463463374607431768211455"
-
 	MAX_UINT160 string = "1461501637330902918203684832716283019655932542975"
-
+	MAX_INT256  string = "57896044618658097711785492504343953926634992332820282019728792003956564819968"
 	MAX_UINT256 string = "115792089237316195423570985008687907853269984665640564039457584007913129639935"
 
 	// Tick Related