Skip to content

Commit 61c959c

Browse files
notJoonnotJoon
authored
Merge pull request #196 from gnoswap-labs/GSW-959-fix-change-package-deploy-path
GSW-959 fix: change package deploy path
2 parents c1fb2a0 + af42fef commit 61c959c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+74
-74
lines changed

‎_lib_package/big/int256/gno.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module gno.land/p/big/int256
1+
module gno.land/p/demo/big/int256

‎_lib_package/big/int256/int256.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package int256
44

55
import (
6-
"gno.land/p/big/uint256"
6+
"gno.land/p/demo/big/uint256"
77
)
88

99
var one = uint256.NewUint(1)

‎_lib_package/big/uint256/gno.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module gno.land/p/big/uint256
1+
module gno.land/p/demo/big/uint256

‎_lib_realm/gnoswap/common/liquidity_amounts.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package common
33
import (
44
"gno.land/r/gnoswap/consts"
55

6-
u256 "gno.land/p/big/uint256"
6+
u256 "gno.land/p/demo/big/uint256"
77
)
88

99
// toAscendingOrder checkes if the first value is greater than

‎_lib_realm/gnoswap/common/tick_math.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package common
22

33
import (
4-
i256 "gno.land/p/big/int256"
5-
u256 "gno.land/p/big/uint256"
4+
i256 "gno.land/p/demo/big/int256"
5+
u256 "gno.land/p/demo/big/uint256"
66
)
77

88
var tickRatioMap = map[int32]*u256.Uint{

‎pool/_GET_no_receiver.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package pool
33
import (
44
"gno.land/p/demo/ufmt"
55

6-
i256 "gno.land/p/big/int256"
7-
u256 "gno.land/p/big/uint256"
6+
i256 "gno.land/p/demo/big/int256"
7+
u256 "gno.land/p/demo/big/uint256"
88
)
99

1010
func PoolGetSlot0SqrtPriceX96(poolPath string) *u256.Uint {

‎pool/_GET_receiver.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package pool
33
import (
44
"gno.land/p/demo/ufmt"
55

6-
i256 "gno.land/p/big/int256"
7-
u256 "gno.land/p/big/uint256"
6+
i256 "gno.land/p/demo/big/int256"
7+
u256 "gno.land/p/demo/big/uint256"
88
)
99

1010
// PoolGetPoolList returns a list of all pool paths

‎pool/_RPC_dry.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"gno.land/r/gnoswap/consts"
99

10-
i256 "gno.land/p/big/int256"
11-
u256 "gno.land/p/big/uint256"
10+
i256 "gno.land/p/demo/big/int256"
11+
u256 "gno.land/p/demo/big/uint256"
1212
)
1313

1414
// DrySwap simulates a swap and returns the amount0, amount1 that would be received and a boolean indicating if the swap is possible

‎pool/_TEST_pool_multi_token_test.gnoa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"gno.land/r/demo/gns"
1515

16-
u256 "gno.land/p/big/uint256"
16+
u256 "gno.land/p/demo/big/uint256"
1717
)
1818

1919
var (

‎pool/_TEST_pool_single_lp_test.gnoa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"gno.land/r/gnoswap/consts"
1414

15-
u256 "gno.land/p/big/uint256"
15+
u256 "gno.land/p/demo/big/uint256"
1616
)
1717

1818
var (

‎pool/bit_math.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package pool
33
import (
44
"gno.land/r/gnoswap/consts"
55

6-
u256 "gno.land/p/big/uint256"
6+
u256 "gno.land/p/demo/big/uint256"
77
)
88

99
type bitShift struct {

‎pool/liquidity_math.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package pool
22

33
import (
4-
i256 "gno.land/p/big/int256"
5-
u256 "gno.land/p/big/uint256"
4+
i256 "gno.land/p/demo/big/int256"
5+
u256 "gno.land/p/demo/big/uint256"
66
)
77

88
func liquidityMathAddDelta(x *u256.Uint, y *i256.Int) *u256.Uint {

‎pool/pool.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
gv "gno.land/r/demo/gov"
1212

13-
i256 "gno.land/p/big/int256"
14-
u256 "gno.land/p/big/uint256"
13+
i256 "gno.land/p/demo/big/int256"
14+
u256 "gno.land/p/demo/big/uint256"
1515
)
1616

1717
// Mint creates a new position and mints liquidity tokens then return amount0, amount1 in string

‎pool/pool_manager.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"gno.land/r/demo/gns"
1313

14-
u256 "gno.land/p/big/uint256"
14+
u256 "gno.land/p/demo/big/uint256"
1515
)
1616

1717
var (

‎pool/position.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"gno.land/p/demo/ufmt"
88
"gno.land/r/gnoswap/consts"
99

10-
i256 "gno.land/p/big/int256"
11-
u256 "gno.land/p/big/uint256"
10+
i256 "gno.land/p/demo/big/int256"
11+
u256 "gno.land/p/demo/big/uint256"
1212
)
1313

1414
func positionGetKey(

‎pool/position_modify.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package pool
33
import (
44
"gno.land/r/gnoswap/common"
55

6-
i256 "gno.land/p/big/int256"
6+
i256 "gno.land/p/demo/big/int256"
77
)
88

99
func (pool *Pool) modifyPosition(params ModifyPositionParams) (PositionInfo, *i256.Int, *i256.Int) {

‎pool/position_update.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package pool
33
import (
44
"std"
55

6-
i256 "gno.land/p/big/int256"
6+
i256 "gno.land/p/demo/big/int256"
77
)
88

99
func (pool *Pool) updatePosition(

‎pool/sqrt_price_math.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package pool
33
import (
44
"gno.land/r/gnoswap/consts"
55

6-
i256 "gno.land/p/big/int256"
7-
u256 "gno.land/p/big/uint256"
6+
i256 "gno.land/p/demo/big/int256"
7+
u256 "gno.land/p/demo/big/uint256"
88
)
99

1010
func sqrtPriceMathGetNextSqrtPriceFromAmount0RoundingUp(

‎pool/swap_math.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package pool
22

33
import (
4-
i256 "gno.land/p/big/int256"
5-
u256 "gno.land/p/big/uint256"
4+
i256 "gno.land/p/demo/big/int256"
5+
u256 "gno.land/p/demo/big/uint256"
66
)
77

88
func swapMathComputeSwapStep(

‎pool/tick.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package pool
33
import (
44
"gno.land/r/gnoswap/consts"
55

6-
i256 "gno.land/p/big/int256"
7-
u256 "gno.land/p/big/uint256"
6+
i256 "gno.land/p/demo/big/int256"
7+
u256 "gno.land/p/demo/big/uint256"
88
)
99

1010
func tickTickSpacingToMaxLiquidityPerTick(tickSpacing int32) *u256.Uint {

‎pool/tick_bitmap.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"gno.land/p/demo/ufmt"
55
"gno.land/r/gnoswap/consts"
66

7-
u256 "gno.land/p/big/uint256"
7+
u256 "gno.land/p/demo/big/uint256"
88
)
99

1010
func tickBitmapPosition(tick int32) (int16, uint8) {

‎pool/type.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package pool
33
import (
44
"std"
55

6-
i256 "gno.land/p/big/int256"
7-
u256 "gno.land/p/big/uint256"
6+
i256 "gno.land/p/demo/big/int256"
7+
u256 "gno.land/p/demo/big/uint256"
88
)
99

1010
type Slot0 struct {

‎pool/utils.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"gno.land/r/gnoswap/consts"
1010

11-
u256 "gno.land/p/big/uint256"
11+
u256 "gno.land/p/demo/big/uint256"
1212
)
1313

1414
func checkTicks(tickLower, tickUpper int32) {

‎pool/withdrawal_fee.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"gno.land/p/demo/ufmt"
1010

11-
u256 "gno.land/p/big/uint256"
11+
u256 "gno.land/p/demo/big/uint256"
1212
)
1313

1414
// withdrawalFee is the fee that is charged when a user withdraws their collected fees

‎position/_GET_no_receiver.gno.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package position
33
import (
44
"std"
55

6-
u256 "gno.land/p/big/uint256"
6+
u256 "gno.land/p/demo/big/uint256"
77
)
88

99
// type Position

‎position/_RPC_api.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
pl "gno.land/r/demo/pool"
1414

15-
u256 "gno.land/p/big/uint256"
15+
u256 "gno.land/p/demo/big/uint256"
1616
)
1717

1818
type RpcPosition struct {

‎position/_RPC_dry.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package position
33
import (
44
"gno.land/r/gnoswap/common"
55

6-
i256 "gno.land/p/big/int256"
7-
u256 "gno.land/p/big/uint256"
6+
i256 "gno.land/p/demo/big/int256"
7+
u256 "gno.land/p/demo/big/uint256"
88
)
99

1010
// DryMint simulates a mint and returns the amount0, amount1 that would be minted

‎position/liquidity_management.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
pl "gno.land/r/demo/pool"
99

10-
u256 "gno.land/p/big/uint256"
10+
u256 "gno.land/p/demo/big/uint256"
1111
)
1212

1313
func addLiquidity(params AddLiquidityParams) (*u256.Uint, *u256.Uint, *u256.Uint) { // uint128, uint256, uint256

‎position/position.gno

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"gno.land/r/demo/gnft"
88
"gno.land/r/demo/wugnot"
99

10-
u256 "gno.land/p/big/uint256"
10+
u256 "gno.land/p/demo/big/uint256"
1111

1212
"gno.land/r/gnoswap/common"
1313
"gno.land/r/gnoswap/consts"
@@ -412,23 +412,23 @@ func decreaseLiquidity(params DecreaseLiquidityParams) (uint64, *u256.Uint, *u25
412412
if !params.unwrapResult {
413413
return params.tokenId, liquidityToRemove, fee0, fee1, amount0, amount1, position.poolKey
414414
}
415-
415+
416416
var (
417-
unwrapAmount uint64
418-
unwrapFee uint64
417+
unwrapAmount uint64
418+
unwrapFee uint64
419419
)
420420
switch {
421421
case pToken0 == consts.WRAPPED_WUGNOT:
422422
unwrapAmount = amount0.Uint64()
423-
unwrapFee = fee0.Uint64()
424-
case pToken1 == consts.WRAPPED_WUGNOT:
425-
unwrapAmount = amount1.Uint64()
426-
unwrapFee = fee1.Uint64()
427-
}
428-
unwrap(unwrapAmount)
429-
unwrap(unwrapFee)
430-
431-
return params.tokenId, liquidityToRemove, fee0, fee1, amount0, amount1, position.poolKey
423+
unwrapFee = fee0.Uint64()
424+
case pToken1 == consts.WRAPPED_WUGNOT:
425+
unwrapAmount = amount1.Uint64()
426+
unwrapFee = fee1.Uint64()
427+
}
428+
unwrap(unwrapAmount)
429+
unwrap(unwrapFee)
430+
431+
return params.tokenId, liquidityToRemove, fee0, fee1, amount0, amount1, position.poolKey
432432
}
433433

434434
// CollectFee collects swap fee from the position

‎position/sqrt_price_math.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package position
33
import (
44
"gno.land/r/gnoswap/consts"
55

6-
i256 "gno.land/p/big/int256"
7-
u256 "gno.land/p/big/uint256"
6+
i256 "gno.land/p/demo/big/int256"
7+
u256 "gno.land/p/demo/big/uint256"
88
)
99

1010
func sqrtPriceMathGetNextSqrtPriceFromAmount0RoundingUp(

‎position/type.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package position
33
import (
44
"std"
55

6-
u256 "gno.land/p/big/uint256"
6+
u256 "gno.land/p/demo/big/uint256"
77
)
88

99
type Position struct {

‎router/_RPC_api.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
pl "gno.land/r/demo/pool"
1212
"gno.land/r/gnoswap/consts"
1313

14-
u256 "gno.land/p/big/uint256"
14+
u256 "gno.land/p/demo/big/uint256"
1515
)
1616

1717
type TokenRatio struct {

‎router/comptue_routes.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
pl "gno.land/r/demo/pool"
77

8-
u256 "gno.land/p/big/uint256"
8+
u256 "gno.land/p/demo/big/uint256"
99
)
1010

1111
// PoolWithMeta is a struct that contains poolPath, token0Path, token1Path, fee, tokenPair, and liquidity

‎router/router.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"gno.land/r/gnoswap/common"
1111
"gno.land/r/gnoswap/consts"
1212

13-
i256 "gno.land/p/big/int256"
14-
u256 "gno.land/p/big/uint256"
13+
i256 "gno.land/p/demo/big/int256"
14+
u256 "gno.land/p/demo/big/uint256"
1515

1616
"gno.land/r/demo/wugnot"
1717
)

‎router/router_dry.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"gno.land/p/demo/ufmt"
88

9-
i256 "gno.land/p/big/int256"
10-
u256 "gno.land/p/big/uint256"
9+
i256 "gno.land/p/demo/big/int256"
10+
u256 "gno.land/p/demo/big/uint256"
1111
)
1212

1313
// DrySwapRoute simulates the swap route and returns the result amount

‎router/swap_inner.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"gno.land/r/gnoswap/consts"
1111

12-
i256 "gno.land/p/big/int256"
13-
u256 "gno.land/p/big/uint256"
12+
i256 "gno.land/p/demo/big/int256"
13+
u256 "gno.land/p/demo/big/uint256"
1414
)
1515

1616
func _swap(

‎router/swap_multi.gno

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"gno.land/r/gnoswap/consts"
77

8-
i256 "gno.land/p/big/int256"
9-
u256 "gno.land/p/big/uint256"
8+
i256 "gno.land/p/demo/big/int256"
9+
u256 "gno.land/p/demo/big/uint256"
1010
)
1111

1212
func multiSwap(params SwapParams, currentPoolIndex, numPools int, swapPath string) (*u256.Uint, *u256.Uint) { // firstAmountIn, lastAmountOut

0 commit comments

Comments
 (0)