Merge pull request #74 from gnoswap-labs/GSW-418-feat-dry-swap

GSW-418 feat: dry swap + fix: various bug
gnoswap-labs · Oct 13, 2023 · d624686 · d624686
2 parents 100992b + 9584555
commit d624686
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/pool/_TEST_math_logic_test.gnoa → pool/_TEST_math_logic_test.gno b/pool/_TEST_math_logic_test.gnoa → pool/_TEST_math_logic_test.gno
diff --git a/pool/_TEST_pool_router_test.gno → pool/_TEST_pool_router_test.gnoa b/pool/_TEST_pool_router_test.gno → pool/_TEST_pool_router_test.gnoa
diff --git a/pool/pool.gno b/pool/pool.gno
@@ -191,6 +191,7 @@ func Swap(
 	require(amountSpecified != 0, "[POOL] pool.gno__Swap() || amountSpecified can't be zero")
 
 	pool := GetPool(pToken0, pToken1, pFee)
+	require(pool.liquidity > 0, ufmt.Sprintf("[POOL] math_logic.gno__swapAmount() || pool.liquidity(%d) must be > 0", pool.liquidity))
 
 	slot0Start := pool.slot0
 	require(slot0Start.unlocked, "[POOL] pool.gno__Swap() || slot0 must be unlocked")
@@ -298,6 +299,8 @@ func Swap(
 			state.amountCalculated += (step.amountIn + step.feeAmount)
 		}
 
+		require(step.amountIn != 0 && step.amountOut != 0, ufmt.Sprintf("[POOL] pool.gno__Swap() || step.amountIn(%d) != 0 && step.amountOut(%d) != 0", step.amountIn, step.amountOut))
+
 		if cache.feeProtocol > 0 {
 			delta := step.feeAmount / bigint(uint64(cache.feeProtocol))
 			requireUnsigned(delta, ufmt.Sprintf("[POOL] pool.gno__Swap() || delta(%s) >= 0", delta))

diff --git a/pool/pool_router.gno b/pool/pool_router.gno
@@ -115,7 +115,7 @@ func poolPathDivide(poolPath string) (string, string, uint16) {
 		panic(ufmt.Sprintf("[POOL] pool_router.gno__poolPathDivide() || len(poolPathSplit) != 3, poolPath: %s", poolPath))
 	}
 
-	feeInt, err := strconv.ParseInt(poolPathSplit[2], 10, 16)
+	feeInt, err := strconv.Atoi(poolPathSplit[2])
 	if err != nil {
 		panic(ufmt.Sprintf("[POOL] pool_router.gno__poolPathDivide() || cannot convert fee(%s) to uint16", poolPathSplit[2]))
 	}