Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(position): Extract JSON From Position #495

Merged
merged 17 commits into from
Feb 5, 2025
Merged

refactor(position): Extract JSON From Position #495

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f011f7e
refactor: position api json
notJoon Feb 3, 2025
6f6fc96
getters
notJoon Feb 3, 2025
0b86d71
entry functions
notJoon Feb 3, 2025
45c641b
fix
notJoon Feb 3, 2025
ce46ff3
fix
notJoon Feb 4, 2025
b2ea39a
gsw-2082 refactor: tokenId to positionId
onlyhyde Feb 4, 2025
1b4d8cf
Merge branch 'main' into change-positionID
onlyhyde Feb 4, 2025
32b274c
fix
notJoon Feb 5, 2025
0e8f661
Merge branch 'main' into change-positionID
notJoon Feb 5, 2025
43108c7
fix
notJoon Feb 5, 2025
6e2d460
tid -> positionIdFrom
notJoon Feb 5, 2025
c7e39a4
fix
notJoon Feb 5, 2025
ef0e3e9
fix
notJoon Feb 5, 2025
50f6fc9
fix
notJoon Feb 5, 2025
d158c63
Merge branch 'main' into change-positionID
onlyhyde Feb 5, 2025
a6a7b11
Merge branch 'main' into change-positionID
notJoon Feb 5, 2025
c3f95ed
fix
notJoon Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
367 changes: 45 additions & 322 deletions contract/r/gnoswap/position/api.gno
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions contract/r/gnoswap/position/api_test.gno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ func TestApiGetPositions(t *testing.T) {
panic(err.Error())
}

lpTokenId, err := response.GetKey("lpTokenId")
lpPositionId, err := response.GetKey("lpPositionId")
if err != nil {
panic(err.Error())
}
uassert.Equal(t, "1", lpTokenId.String())
uassert.Equal(t, "1", lpPositionId.String())

burned, err := response.GetKey("burned")
if err != nil {
Expand Down Expand Up @@ -156,11 +156,11 @@ func TestApiGetPositionsByPoolPath(t *testing.T) {
panic(err.Error())
}

lpTokenId, err := response.GetKey("lpTokenId")
lpPositionId, err := response.GetKey("lpPositionId")
if err != nil {
panic(err.Error())
}
uassert.Equal(t, "1", lpTokenId.String())
uassert.Equal(t, "1", lpPositionId.String())

burned, err := response.GetKey("burned")
if err != nil {
Expand Down Expand Up @@ -276,11 +276,11 @@ func TestApiGetPositionsByAddress(t *testing.T) {
panic(err.Error())
}

lpTokenId, err := response.GetKey("lpTokenId")
lpPositionId, err := response.GetKey("lpPositionId")
if err != nil {
panic(err.Error())
}
uassert.Equal(t, "1", lpTokenId.String())
uassert.Equal(t, "1", lpPositionId.String())

burned, err := response.GetKey("burned")
if err != nil {
Expand Down Expand Up @@ -395,11 +395,11 @@ func TestApiGetPositionsUnclaimedFee(t *testing.T) {
panic(err.Error())
}

lpTokenId, err := response.GetKey("lpTokenId")
lpPositionId, err := response.GetKey("lpPositionId")
if err != nil {
panic(err.Error())
}
uassert.Equal(t, "1", lpTokenId.String())
uassert.Equal(t, "1", lpPositionId.String())

fee0Unclaimed, err := response.GetKey("fee0")
if err != nil {
Expand All @@ -414,9 +414,9 @@ func TestApiGetPositionsUnclaimedFee(t *testing.T) {
uassert.Equal(t, "\"0\"", fee1Unclaimed.String())
}

func TestApiGetPositionUnclaimedFeeByLpTokenId(t *testing.T) {
func TestApiGetPositionUnclaimedFeeByLpPositionId(t *testing.T) {
setupPositions(t)
result := ApiGetPositionUnclaimedFeeByLpTokenId(1)
result := ApiGetPositionUnclaimedFeeByLpPositionId(1)

root, err := json.Unmarshal([]byte(result))
if err != nil {
Expand All @@ -435,11 +435,11 @@ func TestApiGetPositionUnclaimedFeeByLpTokenId(t *testing.T) {
panic(err.Error())
}

lpTokenId, err := response.GetKey("lpTokenId")
lpPositionId, err := response.GetKey("lpPositionId")
if err != nil {
panic(err.Error())
}
uassert.Equal(t, "1", lpTokenId.String())
uassert.Equal(t, "1", lpPositionId.String())

fee0Unclaimed, err := response.GetKey("fee0")
if err != nil {
Expand Down
95 changes: 42 additions & 53 deletions contract/r/gnoswap/position/getter.gno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,68 +9,57 @@ import (
pl "gno.land/r/gnoswap/v1/pool"
)

func PositionGetPosition(tokenId uint64) Position {
position, _ := GetPosition(tokenId)
func PositionGetPosition(positionId uint64) Position {
position, _ := GetPosition(positionId)
return position
}

func PositionGetPositionNonce(tokenId uint64) *u256.Uint {
position := MustGetPosition(tokenId)
return position.nonce
func PositionGetPositionNonce(positionId uint64) *u256.Uint {
return MustGetPosition(positionId).nonce
}

func PositionGetPositionOperator(tokenId uint64) std.Address {
position := MustGetPosition(tokenId)
return position.operator
func PositionGetPositionOperator(positionId uint64) std.Address {
return MustGetPosition(positionId).operator
}

func PositionGetPositionPoolKey(tokenId uint64) string {
position := MustGetPosition(tokenId)
return position.poolKey
func PositionGetPositionPoolKey(positionId uint64) string {
return MustGetPosition(positionId).poolKey
}

func PositionGetPositionTickLower(tokenId uint64) int32 {
position := MustGetPosition(tokenId)
return position.tickLower
func PositionGetPositionTickLower(positionId uint64) int32 {
return MustGetPosition(positionId).tickLower
}

func PositionGetPositionTickUpper(tokenId uint64) int32 {
position := MustGetPosition(tokenId)
return position.tickUpper
func PositionGetPositionTickUpper(positionId uint64) int32 {
return MustGetPosition(positionId).tickUpper
}

func PositionGetPositionLiquidity(tokenId uint64) *u256.Uint {
position := MustGetPosition(tokenId)
return position.liquidity
func PositionGetPositionLiquidity(positionId uint64) *u256.Uint {
return MustGetPosition(positionId).liquidity
}

func PositionGetPositionFeeGrowthInside0LastX128(tokenId uint64) *u256.Uint {
position := MustGetPosition(tokenId)
return position.feeGrowthInside0LastX128
func PositionGetPositionFeeGrowthInside0LastX128(positionId uint64) *u256.Uint {
return MustGetPosition(positionId).feeGrowthInside0LastX128
}

func PositionGetPositionFeeGrowthInside1LastX128(tokenId uint64) *u256.Uint {
position := MustGetPosition(tokenId)
return position.feeGrowthInside1LastX128
func PositionGetPositionFeeGrowthInside1LastX128(positionId uint64) *u256.Uint {
return MustGetPosition(positionId).feeGrowthInside1LastX128
}

func PositionGetPositionTokensOwed0(tokenId uint64) *u256.Uint {
position := MustGetPosition(tokenId)
return position.tokensOwed0
func PositionGetPositionTokensOwed0(positionId uint64) *u256.Uint {
return MustGetPosition(positionId).tokensOwed0
}

func PositionGetPositionTokensOwed1(tokenId uint64) *u256.Uint {
position := MustGetPosition(tokenId)
return position.tokensOwed1
func PositionGetPositionTokensOwed1(positionId uint64) *u256.Uint {
return MustGetPosition(positionId).tokensOwed1
}

func PositionGetPositionIsBurned(tokenId uint64) bool {
position := MustGetPosition(tokenId)
return position.burned
func PositionGetPositionIsBurned(positionId uint64) bool {
return MustGetPosition(positionId).burned
}

func PositionIsInRange(tokenId uint64) bool {
position := MustGetPosition(tokenId)
func PositionIsInRange(positionId uint64) bool {
position := MustGetPosition(positionId)
poolPath := position.poolKey
poolCurrentTick := pl.PoolGetSlot0Tick(poolPath)

Expand All @@ -80,39 +69,39 @@ func PositionIsInRange(tokenId uint64) bool {
return false
}

func PositionGetPositionOwner(tokenId uint64) std.Address {
owner, err := gnft.OwnerOf(tokenIdFrom(tokenId))
func PositionGetPositionOwner(positionId uint64) std.Address {
owner, err := gnft.OwnerOf(tokenIdFrom(positionId))
if err != nil {
panic(newErrorWithDetail(
errDataNotFound, err.Error()))
}
return owner
}

func PositionGetPositionNonceStr(tokenId uint64) string {
return MustGetPosition(tokenId).nonce.ToString()
func PositionGetPositionNonceStr(positionId uint64) string {
return PositionGetPositionNonce(positionId).ToString()
}

func PositionGetPositionOperatorStr(tokenId uint64) string {
return MustGetPosition(tokenId).operator.String()
func PositionGetPositionOperatorStr(positionId uint64) string {
return PositionGetPositionOperator(positionId).String()
}

func PositionGetPositionLiquidityStr(tokenId uint64) string {
return MustGetPosition(tokenId).liquidity.ToString()
func PositionGetPositionLiquidityStr(positionId uint64) string {
return PositionGetPositionLiquidity(positionId).ToString()
}

func PositionGetPositionFeeGrowthInside0LastX128Str(tokenId uint64) string {
return MustGetPosition(tokenId).feeGrowthInside0LastX128.ToString()
func PositionGetPositionFeeGrowthInside0LastX128Str(positionId uint64) string {
return PositionGetPositionFeeGrowthInside0LastX128(positionId).ToString()
}

func PositionGetPositionFeeGrowthInside1LastX128Str(tokenId uint64) string {
return MustGetPosition(tokenId).feeGrowthInside1LastX128.ToString()
func PositionGetPositionFeeGrowthInside1LastX128Str(positionId uint64) string {
return PositionGetPositionFeeGrowthInside1LastX128(positionId).ToString()
}

func PositionGetPositionTokensOwed0Str(tokenId uint64) string {
return MustGetPosition(tokenId).tokensOwed0.ToString()
func PositionGetPositionTokensOwed0Str(positionId uint64) string {
return PositionGetPositionTokensOwed0(positionId).ToString()
}

func PositionGetPositionTokensOwed1Str(tokenId uint64) string {
return MustGetPosition(tokenId).tokensOwed1.ToString()
func PositionGetPositionTokensOwed1Str(positionId uint64) string {
return PositionGetPositionTokensOwed1(positionId).ToString()
}
Loading
Loading