Merge branch 'dry-swap' of https://github.com/gnoswap-labs/gnoswap into dry-swap

Author: 0xTopaz

.gitignore

@@ -348,4 +348,7 @@ pyrightconfig.json
 .history
 .ionide
 
-# End of https://www.toptal.com/developers/gitignore/api/macos,go,goland+all,visualstudiocode,dotenv,python,jupyternotebooks
+# End of https://www.toptal.com/developers/gitignore/api/macos,go,goland+all,visualstudiocode,dotenv,python,jupyternotebooks
+
+.scannerwork
+

_deploy/p/gnoswap/pool/__TEST_swap_math_test.gnoA

@@ -8,24 +8,30 @@ import (
 // SwapMathComputeSwapStepStr computes the next sqrt price, amount in, amount out, and fee amount
 // Computes the result of swapping some amount in, or amount out, given the parameters of the swap
 // The fee, plus the amount in, will never exceed the amount remaining if the swap's `amountSpecified` is positive
+//
 // input:
-// sqrtRatioCurrentX96: the current sqrt price of the pool
-// sqrtRatioTargetX96: The price that cannot be exceeded, from which the direction of the swap is inferred
-// liquidity: The usable liquidity of the pool
-// amountRemaining: How much input or output amount is remaining to be swapped in/out
-// feePips: The fee taken from the input amount, expressed in hundredths of a bip
+// - sqrtRatioCurrentX96: the current sqrt price of the pool
+// - sqrtRatioTargetX96: The price that cannot be exceeded, from which the direction of the swap is inferred
+// - liquidity: The usable liquidity of the pool
+// - amountRemaining: How much input or output amount is remaining to be swapped in/out
+// - feePips: The fee taken from the input amount, expressed in hundredths of a bip
+//
 // output:
-// sqrtRatioNextX96: The price after swapping the amount in/out, not to exceed the price target
-// amountIn: The amount to be swapped in, of either token0 or token1, based on the direction of the swap
-// amountOut: The amount to be received, of either token0 or token1, based on the direction of the swap
-// feeAmount: The amount of input that will be taken as a fee
+// - sqrtRatioNextX96: The price after swapping the amount in/out, not to exceed the price target
+// - amountIn: The amount to be swapped in, of either token0 or token1, based on the direction of the swap
+// - amountOut: The amount to be received, of either token0 or token1, based on the direction of the swap
+// - feeAmount: The amount of input that will be taken as a fee
 func SwapMathComputeSwapStepStr(
-	sqrtRatioCurrentX96 *u256.Uint, // uint160
-	sqrtRatioTargetX96 *u256.Uint, // uint160
-	liquidity *u256.Uint, // uint128
-	amountRemaining *i256.Int, // int256
+	sqrtRatioCurrentX96 *u256.Uint,
+	sqrtRatioTargetX96 *u256.Uint,
+	liquidity *u256.Uint,
+	amountRemaining *i256.Int,
 	feePips uint64,
-) (string, string, string, string) { // (sqrtRatioNextX96, amountIn, amountOut, feeAmount *u256.Uint)
+) (string, string, string, string) {
+	if sqrtRatioCurrentX96 == nil || sqrtRatioTargetX96 == nil || liquidity == nil || amountRemaining == nil {
+		panic("SwapMathComputeSwapStepStr: invalid input")
+	}
+
 	zeroForOne := sqrtRatioCurrentX96.Gte(sqrtRatioTargetX96)
 
 	// POSTIVIE == EXACT_IN => Estimated AmountOut
@@ -39,36 +45,51 @@ func SwapMathComputeSwapStepStr(
 
 	if exactIn {
 		amountRemainingLessFee := u256.MulDiv(amountRemaining.Abs(), u256.NewUint(1000000-feePips), u256.NewUint(1000000))
-
 		if zeroForOne {
-			amountIn = sqrtPriceMathGetAmount0DeltaHelper(sqrtRatioTargetX96, sqrtRatioCurrentX96, liquidity, true)
+			amountIn = sqrtPriceMathGetAmount0DeltaHelper(
+				sqrtRatioTargetX96.Clone(),
+				sqrtRatioCurrentX96.Clone(),
+				liquidity.Clone(),
+				true)
 		} else {
-			amountIn = sqrtPriceMathGetAmount1DeltaHelper(sqrtRatioCurrentX96, sqrtRatioTargetX96, liquidity, true)
+			amountIn = sqrtPriceMathGetAmount1DeltaHelper(
+				sqrtRatioCurrentX96.Clone(),
+				sqrtRatioTargetX96.Clone(),
+				liquidity.Clone(),
+				true)
 		}
 
 		if amountRemainingLessFee.Gte(amountIn) {
 			sqrtRatioNextX96 = sqrtRatioTargetX96.Clone()
 		} else {
 			sqrtRatioNextX96 = sqrtPriceMathGetNextSqrtPriceFromInput(
-				sqrtRatioCurrentX96,
-				liquidity,
-				amountRemainingLessFee,
+				sqrtRatioCurrentX96.Clone(),
+				liquidity.Clone(),
+				amountRemainingLessFee.Clone(),
 				zeroForOne,
 			)
 		}
 	} else {
 		if zeroForOne {
-			amountOut = sqrtPriceMathGetAmount1DeltaHelper(sqrtRatioTargetX96, sqrtRatioCurrentX96, liquidity, false)
+			amountOut = sqrtPriceMathGetAmount1DeltaHelper(
+				sqrtRatioTargetX96.Clone(),
+				sqrtRatioCurrentX96.Clone(),
+				liquidity.Clone(),
+				false)
 		} else {
-			amountOut = sqrtPriceMathGetAmount0DeltaHelper(sqrtRatioCurrentX96, sqrtRatioTargetX96, liquidity, false)
+			amountOut = sqrtPriceMathGetAmount0DeltaHelper(
+				sqrtRatioCurrentX96.Clone(),
+				sqrtRatioTargetX96.Clone(),
+				liquidity.Clone(),
+				false)
 		}
 
 		if amountRemaining.Abs().Gte(amountOut) {
 			sqrtRatioNextX96 = sqrtRatioTargetX96.Clone()
 		} else {
 			sqrtRatioNextX96 = sqrtPriceMathGetNextSqrtPriceFromOutput(
-				sqrtRatioCurrentX96,
-				liquidity,
+				sqrtRatioCurrentX96.Clone(),
+				liquidity.Clone(),
 				amountRemaining.Abs(),
 				zeroForOne,
 			)
@@ -79,26 +100,39 @@ func SwapMathComputeSwapStepStr(
 
 	if zeroForOne {
 		if !(isMax && exactIn) {
-			amountIn = sqrtPriceMathGetAmount0DeltaHelper(sqrtRatioNextX96, sqrtRatioCurrentX96, liquidity, true)
+			amountIn = sqrtPriceMathGetAmount0DeltaHelper(
+				sqrtRatioNextX96.Clone(),
+				sqrtRatioCurrentX96.Clone(),
+				liquidity.Clone(),
+				true)
 		}
-
 		if !(isMax && !exactIn) {
-			amountOut = sqrtPriceMathGetAmount1DeltaHelper(sqrtRatioNextX96, sqrtRatioCurrentX96, liquidity, false)
+			amountOut = sqrtPriceMathGetAmount1DeltaHelper(
+				sqrtRatioNextX96.Clone(),
+				sqrtRatioCurrentX96.Clone(),
+				liquidity.Clone(),
+				false)
 		}
 	} else {
 		if !(isMax && exactIn) {
-			amountIn = sqrtPriceMathGetAmount1DeltaHelper(sqrtRatioCurrentX96, sqrtRatioNextX96, liquidity, true)
+			amountIn = sqrtPriceMathGetAmount1DeltaHelper(
+				sqrtRatioCurrentX96.Clone(),
+				sqrtRatioNextX96.Clone(),
+				liquidity.Clone(),
+				true)
 		}
-
 		if !(isMax && !exactIn) {
-			amountOut = sqrtPriceMathGetAmount0DeltaHelper(sqrtRatioCurrentX96, sqrtRatioNextX96, liquidity, false)
+			amountOut = sqrtPriceMathGetAmount0DeltaHelper(
+				sqrtRatioCurrentX96.Clone(),
+				sqrtRatioNextX96.Clone(),
+				liquidity.Clone(),
+				false)
 		}
 	}
 
 	if !exactIn && amountOut.Gt(amountRemaining.Abs()) {
 		amountOut = amountRemaining.Abs()
 	}
-
 	if exactIn && !(sqrtRatioNextX96.Eq(sqrtRatioTargetX96)) {
 		feeAmount = new(u256.Uint).Sub(amountRemaining.Abs(), amountIn)
 	} else {