Merge pull request #196 from gnoswap-labs/GSW-959-fix-change-package-…

…deploy-path GSW-959 fix: change package deploy path
gnoswap-labs · Mar 19, 2024 · 61c959c · 61c959c
2 parents c1fb2a0 + af42fef
commit 61c959c
Show file tree

Hide file tree

Showing 45 changed files with 74 additions and 74 deletions.
diff --git a/_lib_package/big/int256/gno.mod b/_lib_package/big/int256/gno.mod
@@ -1 +1 @@
-module gno.land/p/big/int256
+module gno.land/p/demo/big/int256
diff --git a/_lib_package/big/int256/int256.gno b/_lib_package/big/int256/int256.gno
@@ -3,7 +3,7 @@
 package int256
 
 import (
-	"gno.land/p/big/uint256"
+	"gno.land/p/demo/big/uint256"
 )
 
 var one = uint256.NewUint(1)

diff --git a/_lib_package/big/uint256/gno.mod b/_lib_package/big/uint256/gno.mod
@@ -1 +1 @@
-module gno.land/p/big/uint256
+module gno.land/p/demo/big/uint256
diff --git a/_lib_realm/gnoswap/common/liquidity_amounts.gno b/_lib_realm/gnoswap/common/liquidity_amounts.gno
@@ -3,7 +3,7 @@ package common
 import (
 	"gno.land/r/gnoswap/consts"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 // toAscendingOrder checkes if the first value is greater than

diff --git a/_lib_realm/gnoswap/common/tick_math.gno b/_lib_realm/gnoswap/common/tick_math.gno
@@ -1,8 +1,8 @@
 package common
 
 import (
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 var tickRatioMap = map[int32]*u256.Uint{

diff --git a/pool/_GET_no_receiver.gno b/pool/_GET_no_receiver.gno
@@ -3,8 +3,8 @@ package pool
 import (
 	"gno.land/p/demo/ufmt"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func PoolGetSlot0SqrtPriceX96(poolPath string) *u256.Uint {

diff --git a/pool/_GET_receiver.gno b/pool/_GET_receiver.gno
@@ -3,8 +3,8 @@ package pool
 import (
 	"gno.land/p/demo/ufmt"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 // PoolGetPoolList returns a list of all pool paths

diff --git a/pool/_RPC_dry.gno b/pool/_RPC_dry.gno
@@ -7,8 +7,8 @@ import (
 
 	"gno.land/r/gnoswap/consts"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 // DrySwap simulates a swap and returns the amount0, amount1 that would be received and a boolean indicating if the swap is possible

diff --git a/pool/_TEST_pool_multi_token_test.gnoa b/pool/_TEST_pool_multi_token_test.gnoa
@@ -13,7 +13,7 @@ import (
 
 	"gno.land/r/demo/gns"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 var (

diff --git a/pool/_TEST_pool_single_lp_test.gnoa b/pool/_TEST_pool_single_lp_test.gnoa
@@ -12,7 +12,7 @@ import (
 
 	"gno.land/r/gnoswap/consts"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 var (

diff --git a/pool/bit_math.gno b/pool/bit_math.gno
@@ -3,7 +3,7 @@ package pool
 import (
 	"gno.land/r/gnoswap/consts"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 type bitShift struct {

diff --git a/pool/liquidity_math.gno b/pool/liquidity_math.gno
@@ -1,8 +1,8 @@
 package pool
 
 import (
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func liquidityMathAddDelta(x *u256.Uint, y *i256.Int) *u256.Uint {

diff --git a/pool/pool.gno b/pool/pool.gno
@@ -10,8 +10,8 @@ import (
 
 	gv "gno.land/r/demo/gov"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 // Mint creates a new position and mints liquidity tokens then return amount0, amount1 in string

diff --git a/pool/pool_manager.gno b/pool/pool_manager.gno
@@ -11,7 +11,7 @@ import (
 
 	"gno.land/r/demo/gns"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 var (

diff --git a/pool/position.gno b/pool/position.gno
@@ -7,8 +7,8 @@ import (
 	"gno.land/p/demo/ufmt"
 	"gno.land/r/gnoswap/consts"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func positionGetKey(

diff --git a/pool/position_modify.gno b/pool/position_modify.gno
@@ -3,7 +3,7 @@ package pool
 import (
 	"gno.land/r/gnoswap/common"
 
-	i256 "gno.land/p/big/int256"
+	i256 "gno.land/p/demo/big/int256"
 )
 
 func (pool *Pool) modifyPosition(params ModifyPositionParams) (PositionInfo, *i256.Int, *i256.Int) {

diff --git a/pool/position_update.gno b/pool/position_update.gno
@@ -3,7 +3,7 @@ package pool
 import (
 	"std"
 
-	i256 "gno.land/p/big/int256"
+	i256 "gno.land/p/demo/big/int256"
 )
 
 func (pool *Pool) updatePosition(

diff --git a/pool/sqrt_price_math.gno b/pool/sqrt_price_math.gno
@@ -3,8 +3,8 @@ package pool
 import (
 	"gno.land/r/gnoswap/consts"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func sqrtPriceMathGetNextSqrtPriceFromAmount0RoundingUp(

diff --git a/pool/swap_math.gno b/pool/swap_math.gno
@@ -1,8 +1,8 @@
 package pool
 
 import (
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func swapMathComputeSwapStep(

diff --git a/pool/tick.gno b/pool/tick.gno
@@ -3,8 +3,8 @@ package pool
 import (
 	"gno.land/r/gnoswap/consts"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func tickTickSpacingToMaxLiquidityPerTick(tickSpacing int32) *u256.Uint {

diff --git a/pool/tick_bitmap.gno b/pool/tick_bitmap.gno
@@ -4,7 +4,7 @@ import (
 	"gno.land/p/demo/ufmt"
 	"gno.land/r/gnoswap/consts"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func tickBitmapPosition(tick int32) (int16, uint8) {

diff --git a/pool/type.gno b/pool/type.gno
@@ -3,8 +3,8 @@ package pool
 import (
 	"std"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 type Slot0 struct {

diff --git a/pool/utils.gno b/pool/utils.gno
@@ -8,7 +8,7 @@ import (
 
 	"gno.land/r/gnoswap/consts"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func checkTicks(tickLower, tickUpper int32) {

diff --git a/pool/withdrawal_fee.gno b/pool/withdrawal_fee.gno
@@ -8,7 +8,7 @@ import (
 
 	"gno.land/p/demo/ufmt"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 // withdrawalFee is the fee that is charged when a user withdraws their collected fees

diff --git a/position/_GET_no_receiver.gno.gno b/position/_GET_no_receiver.gno.gno
@@ -3,7 +3,7 @@ package position
 import (
 	"std"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 // type Position

diff --git a/position/_RPC_api.gno b/position/_RPC_api.gno
@@ -12,7 +12,7 @@ import (
 
 	pl "gno.land/r/demo/pool"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 type RpcPosition struct {

diff --git a/position/_RPC_dry.gno b/position/_RPC_dry.gno
@@ -3,8 +3,8 @@ package position
 import (
 	"gno.land/r/gnoswap/common"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 // DryMint simulates a mint and returns the amount0, amount1 that would be minted

diff --git a/position/liquidity_management.gno b/position/liquidity_management.gno
@@ -7,7 +7,7 @@ import (
 
 	pl "gno.land/r/demo/pool"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func addLiquidity(params AddLiquidityParams) (*u256.Uint, *u256.Uint, *u256.Uint) { // uint128, uint256, uint256

diff --git a/position/position.gno b/position/position.gno
@@ -7,7 +7,7 @@ import (
 	"gno.land/r/demo/gnft"
 	"gno.land/r/demo/wugnot"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 
 	"gno.land/r/gnoswap/common"
 	"gno.land/r/gnoswap/consts"
@@ -412,23 +412,23 @@ func decreaseLiquidity(params DecreaseLiquidityParams) (uint64, *u256.Uint, *u25
 	if !params.unwrapResult {
 		return params.tokenId, liquidityToRemove, fee0, fee1, amount0, amount1, position.poolKey
 	}
-	
+
 	var (
-		unwrapAmount  uint64
-		unwrapFee uint64
+		unwrapAmount uint64
+		unwrapFee    uint64
 	)
 	switch {
 	case pToken0 == consts.WRAPPED_WUGNOT:
 		unwrapAmount = amount0.Uint64()
-    		unwrapFee = fee0.Uint64()
-    	case pToken1 == consts.WRAPPED_WUGNOT:
-        	unwrapAmount = amount1.Uint64()
-        	unwrapFee = fee1.Uint64()
-        }
-        unwrap(unwrapAmount)
-        unwrap(unwrapFee)
-        
-        return params.tokenId, liquidityToRemove, fee0, fee1, amount0, amount1, position.poolKey
+		unwrapFee = fee0.Uint64()
+	case pToken1 == consts.WRAPPED_WUGNOT:
+		unwrapAmount = amount1.Uint64()
+		unwrapFee = fee1.Uint64()
+	}
+	unwrap(unwrapAmount)
+	unwrap(unwrapFee)
+
+	return params.tokenId, liquidityToRemove, fee0, fee1, amount0, amount1, position.poolKey
 }
 
 // CollectFee collects swap fee from the position

diff --git a/position/sqrt_price_math.gno b/position/sqrt_price_math.gno
@@ -3,8 +3,8 @@ package position
 import (
 	"gno.land/r/gnoswap/consts"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func sqrtPriceMathGetNextSqrtPriceFromAmount0RoundingUp(

diff --git a/position/type.gno b/position/type.gno
@@ -3,7 +3,7 @@ package position
 import (
 	"std"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 type Position struct {

diff --git a/router/_RPC_api.gno b/router/_RPC_api.gno
@@ -11,7 +11,7 @@ import (
 	pl "gno.land/r/demo/pool"
 	"gno.land/r/gnoswap/consts"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 type TokenRatio struct {

diff --git a/router/comptue_routes.gno b/router/comptue_routes.gno
@@ -5,7 +5,7 @@ import (
 
 	pl "gno.land/r/demo/pool"
 
-	u256 "gno.land/p/big/uint256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 // PoolWithMeta is a struct that contains poolPath, token0Path, token1Path, fee, tokenPair, and liquidity

diff --git a/router/router.gno b/router/router.gno
@@ -10,8 +10,8 @@ import (
 	"gno.land/r/gnoswap/common"
 	"gno.land/r/gnoswap/consts"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 
 	"gno.land/r/demo/wugnot"
 )

diff --git a/router/router_dry.gno b/router/router_dry.gno
@@ -6,8 +6,8 @@ import (
 
 	"gno.land/p/demo/ufmt"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 // DrySwapRoute simulates the swap route and returns the result amount

diff --git a/router/swap_inner.gno b/router/swap_inner.gno
@@ -9,8 +9,8 @@ import (
 
 	"gno.land/r/gnoswap/consts"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func _swap(

diff --git a/router/swap_multi.gno b/router/swap_multi.gno
@@ -5,8 +5,8 @@ import (
 
 	"gno.land/r/gnoswap/consts"
 
-	i256 "gno.land/p/big/int256"
-	u256 "gno.land/p/big/uint256"
+	i256 "gno.land/p/demo/big/int256"
+	u256 "gno.land/p/demo/big/uint256"
 )
 
 func multiSwap(params SwapParams, currentPoolIndex, numPools int, swapPath string) (*u256.Uint, *u256.Uint) { // firstAmountIn, lastAmountOut
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module gno.land/p/big/int256
		module gno.land/p/demo/big/int256
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		module gno.land/p/big/uint256
		module gno.land/p/demo/big/uint256
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ import ( @@
     	"gno.land/r/demo/gns"
-    	u256 "gno.land/p/big/uint256"
+    	u256 "gno.land/p/demo/big/uint256"
     )
     var (
@@ Expand Down @@