Skip to content

Commit f64fa9f

Browse files
notJoonnotJoon
committed
fix: mint
1 parent 663d3c6 commit f64fa9f

File tree

51 files changed

+131
-69
lines changed

Some content is hidden

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

51 files changed

+131
-69
lines changed

‎contract/r/gnoswap/launchpad/tests/launchpad_reward_and_gov_reward_02_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func testPositionMint(t *testing.T) {
7777
bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
7878
foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
7979

80-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, fooPath, fee500, int32(-8000), int32(8000), "10000000000", "10000000000", "0", "0", max_timeout, admin, admin)
80+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, fooPath, fee500, int32(-8000), int32(8000), "10000000000", "10000000000", "0", "0", max_timeout, admin, admin, "")
8181
uassert.Equal(t, tokenId, uint64(1))
8282
uassert.Equal(t, amount0, "10000000000")
8383
uassert.Equal(t, amount1, "10000000000")

‎contract/r/gnoswap/launchpad/tests/launchpad_reward_and_gov_reward_03_test.gnoA

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,20 +120,20 @@ func testMint(t *testing.T) {
120120
wugnot.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
121121
gns.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
122122

123-
tokenId, liquidity, amount0, amount1 := pn.Mint(consts.WUGNOT_PATH, consts.GNS_PATH, fee3000, int32(-8040), int32(8040), "10000000000", "10000000000", "0", "0", max_timeout, admin, admin)
123+
tokenId, liquidity, amount0, amount1 := pn.Mint(consts.WUGNOT_PATH, consts.GNS_PATH, fee3000, int32(-8040), int32(8040), "10000000000", "10000000000", "0", "0", max_timeout, admin, admin, "")
124124
uassert.Equal(t, tokenId, uint64(1))
125125
uassert.Equal(t, amount0, "10000000000")
126126
uassert.Equal(t, amount1, "10000000000")
127127

128128
std.TestSetRealm(adminRealm)
129129
bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
130130
foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
131-
pn.Mint(barPath, fooPath, fee500, int32(-8000), int32(8000), "10000000000", "10000000000", "0", "0", max_timeout, admin, admin)
131+
pn.Mint(barPath, fooPath, fee500, int32(-8000), int32(8000), "10000000000", "10000000000", "0", "0", max_timeout, admin, admin, "")
132132

133133
std.TestSetRealm(adminRealm)
134134
bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
135135
baz.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
136-
pn.Mint(barPath, bazPath, fee500, int32(-8000), int32(8000), "10000000000", "10000000000", "0", "0", max_timeout, admin, admin)
136+
pn.Mint(barPath, bazPath, fee500, int32(-8000), int32(8000), "10000000000", "10000000000", "0", "0", max_timeout, admin, admin, "")
137137

138138
checkProtocolFeeBalance()
139139
// (still) gns 300_000_000

‎contract/r/gnoswap/pool/_helper_test.gno

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,9 @@ func MintPosition(t *testing.T,
223223
amount1Min,
224224
deadline,
225225
mintTo,
226-
caller)
226+
caller,
227+
"",
228+
)
227229
}
228230

229231
func MintPositionAll(t *testing.T, caller std.Address) {

‎contract/r/gnoswap/pool/protocol_fee_withdrawal_test.gno

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ func TestHandleWithdrawalFee(t *testing.T) {
8484
max_timeout,
8585
alice,
8686
alice,
87+
"",
8788
)
8889
},
8990
verify: func(t *testing.T) (string, string) {

‎contract/r/gnoswap/position/_helper_test.gno

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,9 @@ func MintPosition(t *testing.T,
242242
amount1Min,
243243
deadline,
244244
mintTo,
245-
caller)
245+
caller,
246+
"",
247+
)
246248
}
247249

248250
func MintPositionAll(t *testing.T, caller std.Address) {
@@ -433,6 +435,7 @@ func MakeMintPositionWithoutFee(t *testing.T) (uint64, string, string, string) {
433435
max_timeout,
434436
admin,
435437
admin,
438+
"",
436439
)
437440
}
438441

‎contract/r/gnoswap/position/position.gno

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,13 @@ func Mint(
181181
deadline int64,
182182
mintTo std.Address,
183183
caller std.Address,
184+
referrerAddr std.Address,
184185
) (uint64, string, string, string) {
185186
assertOnlyNotHalted()
186187
prevCaller := getPrevRealm()
187188
assertOnlyUserOrStaker(prevCaller)
189+
190+
positionKeeper.tryRegisterReferral(caller, referrerAddr)
188191
if isUserCall() {
189192
// if user called, validate the prev address and input addresses(mintTo, caller)
190193
assertOnlyValidAddressWith(prevCaller.Addr(), mintTo)

‎contract/r/gnoswap/position/position_test.gno

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,7 @@ func TestMint(t *testing.T) {
816816
tc.deadline,
817817
tc.mintTo,
818818
tc.caller,
819+
"",
819820
)
820821
})
821822
} else {
@@ -832,6 +833,7 @@ func TestMint(t *testing.T) {
832833
tc.deadline,
833834
tc.mintTo,
834835
tc.caller,
836+
"",
835837
)
836838

837839
uassert.Equal(t, uint64(5), tokenId)
@@ -1120,6 +1122,7 @@ func TestDecreaseLiquidity(t *testing.T) {
11201122
time.Now().Add(time.Hour).Unix(),
11211123
admin,
11221124
admin,
1125+
"",
11231126
)
11241127
for _, tc := range tests {
11251128
t.Run(tc.name, func(t *testing.T) {
@@ -1243,6 +1246,7 @@ func TestCollectFees(t *testing.T) {
12431246
time.Now().Add(time.Hour).Unix(),
12441247
admin,
12451248
admin,
1249+
"",
12461250
)
12471251

12481252
for _, tt := range tests {
@@ -1362,6 +1366,7 @@ func TestReposition(t *testing.T) {
13621366
time.Now().Add(time.Hour).Unix(),
13631367
admin,
13641368
admin,
1369+
"",
13651370
)
13661371

13671372
for _, tt := range tests {

‎contract/r/gnoswap/position/referral.gno

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,32 @@ func (k *keeper) Disable() {
3131
k.referralConfig.Disable()
3232
}
3333

34-
// tryRegisterReferral attempts to register a referral relationship if enabled and not already existing.
35-
// This is a non-blocking operation - failures will be logged but won't stop the main flow.
36-
func (k *keeper) tryRegisterReferral(caller std.Address, referralAddr *std.Address) {
37-
if referralAddr == nil || !k.referralConfig.IsEnabled() {
34+
// tryRegisterReferral attempts to register a referral relationship if conditions are met.
35+
// This is a no-op if:
36+
// - Referral system is disabled
37+
// - Referrer address is empty
38+
// - User already has a referrer
39+
func (k *keeper) tryRegisterReferral(user, referral std.Address) {
40+
// skip if referral is disabled or referrer address is empty
41+
if !k.referralConfig.IsEnabled() || referral.String() == "" {
3842
return
3943
}
4044

4145
ref := k.referralConfig.Referral()
42-
if ref.Has(caller) {
46+
if ref.Has(user) {
4347
return
4448
}
4549

46-
err := ref.Register(caller, *referralAddr)
50+
emitParams := []string{
51+
"user", user.String(),
52+
"referral", referral.String(),
53+
}
54+
55+
err := ref.Register(user, referral)
4756
if err != nil {
48-
// for logging purposes
49-
std.Emit(
50-
referralRegisterFailed,
51-
"caller", caller.String(),
52-
"referrer", referralAddr.String(),
53-
)
57+
std.Emit(referralRegisterFailed, emitParams...)
5458
return
5559
}
5660

57-
std.Emit(
58-
referralRegistered,
59-
"caller", caller.String(),
60-
"referrer", referralAddr.String(),
61-
)
61+
std.Emit(referralRegistered, emitParams...)
6262
}

‎contract/r/gnoswap/router/_helper_test.gno

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ func MakeMintPositionWithoutFee(t *testing.T) (uint64, string, string, string) {
409409
max_timeout,
410410
admin,
411411
admin,
412+
"",
412413
)
413414
}
414415

@@ -433,6 +434,7 @@ func MakeSecondMintPositionWithoutFee(t *testing.T) (uint64, string, string, str
433434
max_timeout,
434435
admin,
435436
admin,
437+
"",
436438
)
437439
}
438440

@@ -457,6 +459,7 @@ func MakeThirdMintPositionWithoutFee(t *testing.T) (uint64, string, string, stri
457459
max_timeout,
458460
admin,
459461
admin,
462+
"",
460463
)
461464
}
462465

@@ -483,5 +486,6 @@ func MakeForthMintPositionWithoutFee(t *testing.T) (uint64, string, string, stri
483486
max_timeout,
484487
admin,
485488
admin,
489+
"",
486490
)
487491
}

‎contract/r/gnoswap/router/tests/router_all_2_route_2_hop_test.gnoA

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ func TestPositionMint(t *testing.T) {
3636
qux.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
3737

3838
// Mint
39-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, uint32(500), int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
40-
tokenId, liquidity, amount0, amount1 = pn.Mint(bazPath, quxPath, uint32(500), int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
39+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, uint32(500), int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
40+
tokenId, liquidity, amount0, amount1 = pn.Mint(bazPath, quxPath, uint32(500), int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
4141
}
4242

4343
func TestDrySwapRouteBarQuxExactIn(t *testing.T) {

‎contract/r/gnoswap/router/tests/router_spec_#1_ExactIn_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestPositionMint(t *testing.T) {
3434
baz.Approve(consts.POOL_ADDR, 100000000)
3535

3636
// Mint
37-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, FEE_MEDIUM, int32(-887220), int32(887220), "100000000", "100000000", "0", "0", max_timeout, adminAddr, adminAddr)
37+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, FEE_MEDIUM, int32(-887220), int32(887220), "100000000", "100000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
3838

3939
uassert.Equal(t, tokenId, uint64(1))
4040
uassert.Equal(t, amount0, "100000000")

‎contract/r/gnoswap/router/tests/router_spec_#2_ExactIn_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestExactInputSinglePool1_to_0(t *testing.T) {
3131
pl.CreatePool(barPath, token0Path, 3000, "79228162514264337593543950336") // encodePriceSqrt(1, 1)
3232
poolPath := "gno.land/r/onbloc/bar:gno.land/r/onbloc/foo:3000"
3333

34-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, token0Path, 3000, minTick, maxTick, "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
34+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, token0Path, 3000, minTick, maxTick, "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
3535
pool := pl.GetPool(barPath, token0Path, FEE_MEDIUM)
3636
poolLiq := pool.Liquidity()
3737
uassert.Equal(t, poolLiq.ToString(), "1000000")

‎contract/r/gnoswap/router/tests/router_spec_#3_ExactIn_test.gnoA

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ func TestPositionMint(t *testing.T) {
4242
foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
4343

4444
// Mint
45-
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
46-
47-
pn.Mint(bazPath, fooPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
45+
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
46+
pn.Mint(bazPath, fooPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
4847
}
4948

5049
func TestSwapRouteFooBarExactIn(t *testing.T) {

‎contract/r/gnoswap/router/tests/router_spec_#4_ExactIn_test.gnoA

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ func TestPositionMint(t *testing.T) {
4242
foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
4343

4444
// Mint
45-
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
46-
47-
pn.Mint(bazPath, fooPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
45+
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
46+
pn.Mint(bazPath, fooPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
4847
}
4948

5049
func TestSwapRouteBarfooExactIn(t *testing.T) {

‎contract/r/gnoswap/router/tests/router_spec_#5_ExactOut_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestPositionMint(t *testing.T) {
3636
baz.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
3737

3838
// Mint
39-
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
39+
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
4040
}
4141

4242
func TestSwapRouteBarBazExactOut(t *testing.T) {

‎contract/r/gnoswap/router/tests/router_spec_#6_ExactOut_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestPositionMint(t *testing.T) {
3434
baz.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
3535

3636
// Mint
37-
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
37+
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
3838
}
3939

4040
func TestSwapRouteBazBarExactOut(t *testing.T) {

‎contract/r/gnoswap/router/tests/router_spec_#7_ExactOut_test.gnoA

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ func TestPositionMint(t *testing.T) {
4242
foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
4343

4444
// Mint
45-
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
46-
pn.Mint(bazPath, fooPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
45+
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
46+
pn.Mint(bazPath, fooPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
4747
}
4848

4949
func TestSwapRouteBarfooExactOut(t *testing.T) {

‎contract/r/gnoswap/router/tests/router_spec_#8_ExactOut_test.gnoA

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ func TestPositionMint(t *testing.T) {
4242
foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
4343

4444
// Mint
45-
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
46-
47-
pn.Mint(bazPath, fooPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr)
45+
pn.Mint(barPath, bazPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
46+
pn.Mint(bazPath, fooPath, uint32(3000), int32(-887220), int32(887220), "1000000", "1000000", "0", "0", max_timeout, adminAddr, adminAddr, "")
4847
}
4948

5049
func TestSwapRouteFooBarExactOut(t *testing.T) {

‎contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_all_liquidity_exact_in_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestPositionMint(t *testing.T) {
3333
baz.Approve(consts.POOL_ADDR, 100000)
3434

3535
// Mint
36-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(-6000), int32(6000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
36+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(-6000), int32(6000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
3737

3838
uassert.Equal(t, tokenId, uint64(1))
3939
uassert.Equal(t, amount0, "99962")

‎contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_all_liquidity_exact_out_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestPositionMint(t *testing.T) {
3333
baz.Approve(consts.POOL_ADDR, 100000)
3434

3535
// Mint
36-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(-6000), int32(6000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
36+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(-6000), int32(6000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
3737

3838
uassert.Equal(t, tokenId, uint64(1))
3939
uassert.Equal(t, amount0, "99962")

‎contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_native_in_out_test_exact_in_test.gnoA

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func testPositionMint(t *testing.T) {
5959
std.TestSetRealm(adminRealm)
6060
bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
6161
baz.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
62-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
62+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
6363

6464
uassert.Equal(t, tokenId, uint64(1))
6565
uassert.Equal(t, amount0, "36790") // bar
@@ -71,7 +71,7 @@ func testPositionMint(t *testing.T) {
7171
std.TestSetRealm(adminRealm)
7272
baz.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
7373
qux.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
74-
tokenId, liquidity, amount0, amount1 := pn.Mint(bazPath, quxPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
74+
tokenId, liquidity, amount0, amount1 := pn.Mint(bazPath, quxPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
7575

7676
uassert.Equal(t, tokenId, uint64(2))
7777
uassert.Equal(t, amount0, "36790")
@@ -89,7 +89,7 @@ func testPositionMint(t *testing.T) {
8989
std.TestIssueCoins(consts.POSITION_ADDR, std.Coins{{"ugnot", 1000009}}) // without issuing, it will fail `source address g1q646ctzhvn60v492x8ucvyqnrj2w30cwh6efk5 does not exist`
9090
std.TestSetOrigSend(std.Coins{{"ugnot", 1000009}}, nil)
9191

92-
tokenId, liquidity, amount0, amount1 := pn.Mint(quxPath, consts.GNOT, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
92+
tokenId, liquidity, amount0, amount1 := pn.Mint(quxPath, consts.GNOT, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
9393

9494
uassert.Equal(t, tokenId, uint64(3))
9595
uassert.Equal(t, amount0, "100000")

‎contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_out_range_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestPositionMint(t *testing.T) {
4646
baz.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
4747

4848
// Mint
49-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(8000), int32(12000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
49+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(8000), int32(12000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
5050

5151
uassert.Equal(t, tokenId, uint64(1))
5252
uassert.Equal(t, liquidity, "637408")

‎contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestPositionMint(t *testing.T) {
3636
baz.Approve(consts.POOL_ADDR, 100000)
3737

3838
// Mint
39-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
39+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
4040

4141
uassert.Equal(t, tokenId, uint64(1))
4242
uassert.Equal(t, amount0, "36790")

‎contract/r/gnoswap/router/tests/router_swap_route_1route_1hop_wrapped_native_in_out_test.gnoA

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestPositionMintQuxGnot(t *testing.T) {
3838
qux.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
3939
wugnot.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
4040

41-
tokenId, liquidity, amount0, amount1 := pn.Mint(quxPath, consts.WRAPPED_WUGNOT, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
41+
tokenId, liquidity, amount0, amount1 := pn.Mint(quxPath, consts.WRAPPED_WUGNOT, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
4242

4343
uassert.Equal(t, tokenId, uint64(1))
4444
uassert.Equal(t, amount0, "100000")

‎contract/r/gnoswap/router/tests/router_swap_route_1route_2hop_wrapped_native_in_out_test.gnoA

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestPositionMintBarBaz(t *testing.T) {
4141
std.TestSetRealm(adminRealm)
4242
bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
4343
baz.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
44-
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
44+
tokenId, liquidity, amount0, amount1 := pn.Mint(barPath, bazPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
4545

4646
uassert.Equal(t, tokenId, uint64(1))
4747
uassert.Equal(t, amount0, "36790") // bar
@@ -53,7 +53,7 @@ func TestPositionMintBazQux(t *testing.T) {
5353
baz.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
5454
qux.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
5555

56-
tokenId, liquidity, amount0, amount1 := pn.Mint(bazPath, quxPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
56+
tokenId, liquidity, amount0, amount1 := pn.Mint(bazPath, quxPath, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
5757

5858
uassert.Equal(t, tokenId, uint64(2))
5959
uassert.Equal(t, amount0, "36790")
@@ -74,7 +74,7 @@ func TestPositionMintQuxGnot(t *testing.T) {
7474
qux.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
7575
wugnot.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
7676

77-
tokenId, liquidity, amount0, amount1 := pn.Mint(quxPath, consts.WRAPPED_WUGNOT, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr)
77+
tokenId, liquidity, amount0, amount1 := pn.Mint(quxPath, consts.WRAPPED_WUGNOT, fee500, int32(9000), int32(11000), "100000", "100000", "0", "0", max_timeout, adminAddr, adminAddr, "")
7878

7979
uassert.Equal(t, tokenId, uint64(3))
8080
uassert.Equal(t, amount0, "100000")

0 commit comments

Comments
 (0)