gnoswap-labs · notJoon · Apr 12, 2024 · Apr 12, 2024 · Apr 12, 2024 · Apr 12, 2024
diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ test.prepare:
 
 	cp -r "$(PWD)/_deploy/p/demo/gnoswap" ".test/examples/gno.land/p/demo" # gnoswap base package
 
-	cp -r "$(PWD)/_deploy/r/gnoswap" ".test/examples/gno.land/r/gnoswap" # gnoswap base realm
+	cp -r "$(PWD)/_deploy/r/demo/gnoswap" ".test/examples/gno.land/r/demo/gnoswap" # gnoswap base realm
 
 	cp -r "$(PWD)/gov" "$(PWD)/pool" "$(PWD)/position" "$(PWD)/router" "$(PWD)/staker" ".test/examples/gno.land/r/demo" # gnoswap realm
 

diff --git a/README.md b/README.md
@@ -31,46 +31,49 @@ To run unit tests, follow these steps:
 ### Set Up Gnoswap Contracts in Gno Core
 
 1. Clone the `gnoswap` contracts repository:
+
    ```
    $ cd $WORKDIR
    $ git clone https://github.com/gnoswap-labs/gnoswap.git
    $ cd gnoswap
    ```
 
 2. Copy the `gnoswap` contracts into the Gno core:
+
    ```
    # copy grc20 tokens
    $ cp -R __local/grc20_tokens/* $WORK_DIR/gno/examples/gno.land/r/demo
    $ cp -R _deploy/r/demo/* $WORK_DIR/gno/examples/gno.land/r/demo
-   
+
    # copy gnoswap base packages ( includes uint256, int256 and bit of pool calculation )
    $ cp -R _deploy/p/demo/gnoswap $WORK_DIR/gno/examples/gno.land/p/demo
-   
+
    # copy gnoswap base realms ( includes common logic, variables and consts )
    $ cp -R _deploy/r/gnoswap $WORK_DIR/gno/examples/gno.land/r/gnoswap
-   
+
    # copy gnoswap realms
    $ cp -R gov pool position router staker $WORK_DIR/gno/examples/gno.land/r/demo
    ```
 
 3. Move all test cases into its own directory:
+
    ```
    # Governance
    $ cd $WORKDIR/gno/examples/gno.land/r/demo/gov
    $ mv _TEST_/* .
-   
+
    # Pool
    $ cd $WORKDIR/gno/examples/gno.land/r/demo/pool
    $ mv _TEST_/* .
-   
+
    # Position
    $ cd $WORKDIR/gno/examples/gno.land/r/demo/position
    $ mv _TEST_/* .
-   
+
    # Router
    $ cd $WORKDIR/gno/examples/gno.land/r/demo/router
    $ mv _TEST_/* .
-   
+
    # Staker
    $ cd $WORKDIR/gno/examples/gno.land/r/demo/staker
    $ mv _TEST_/* .
@@ -87,10 +90,12 @@ $ gno test -root-dir $WORKDIR/gno-for-swap -verbose=true $WORKDIR/gno/examples/g
 The contracts can be tested using [testscript](https://github.com/gnolang/gno/blob/d54ca62749f79a6992da520e1659ba0dbbdd980b/gno.land/pkg/integration/doc.go)
 
 ### Change Admin Address
-1. Open `$WORKDIR/gno/examples/gno.land/r/gnoswap/consts/consts.gno`
+
+1. Open `$WORKDIR/gno/examples/gno.land/r/demo/gnoswap/consts/consts.gno`
 2. Change `GNOSWAP_ADMIN`, `FEE_COLLECTOR` to `g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5`
 
 ### Testing
+
 ```
 $ cd $WORKDIR/gnoswap
 $ cp __local/test/gnoswap.txtar $WORKDIR/gno/gno.land/cmd/gnoland/testdata/
@@ -100,14 +105,11 @@ $ go test -v . -run Testdata/gnoswap
 ```
 
 ## WARNING
-> [!WARNING]
-> To deploy `pool` contract, `9781838` gas is required which is close to the [block gas limit](https://github.com/gnolang/gno/blob/831bb6f92e1a2217242169dab1f4fd1f87e5eaa0/tm2/pkg/bft/types/params.go#L26-L27).
+
+> [!WARNING] To deploy `pool` contract, `9781838` gas is required which is close to the [block gas limit](https://github.com/gnolang/gno/blob/831bb6f92e1a2217242169dab1f4fd1f87e5eaa0/tm2/pkg/bft/types/params.go#L26-L27).
 >
 > So, when changing the `pool` contract, make sure to test it on actual network before making PR.
 
-
-> [!WARNING]
-> To deploy `uint256` contract, `9731522` gas is required which is close to the [block gas limit](https://github.com/gnolang/gno/blob/831bb6f92e1a2217242169dab1f4fd1f87e5eaa0/tm2/pkg/bft/types/params.go#L26-L27).
+> [!WARNING] To deploy `uint256` contract, `9731522` gas is required which is close to the [block gas limit](https://github.com/gnolang/gno/blob/831bb6f92e1a2217242169dab1f4fd1f87e5eaa0/tm2/pkg/bft/types/params.go#L26-L27).
 >
 > So, when changing the `uint256` contract, make sure to test it on actual network before making PR.
-
diff --git a/__local/test/gnoswap.txtar b/__local/test/gnoswap.txtar
@@ -10,8 +10,8 @@ loadpkg gno.land/r/demo/users
 loadpkg gno.land/r/demo/wugnot
 loadpkg gno.land/r/demo/foo20
 
-loadpkg gno.land/r/gnoswap/consts
-loadpkg gno.land/r/gnoswap/common
+loadpkg gno.land/r/demo/gnoswap/consts
+loadpkg gno.land/r/demo/gnoswap/common
 
 loadpkg gno.land/r/demo/gns
 loadpkg gno.land/r/demo/gnft

diff --git a/__local/test/test_data.mk b/__local/test/test_data.mk
@@ -16,15 +16,15 @@ ADDR_WUGNOT := g1pf6dv9fjk3rn0m4jjcne306ga4he3mzmupfjl6
 MAX_UINT64 := 18446744073709551615
 TX_EXPIRE := 9999999999
 
-NOW := $(shell date +%s)
-INCENTIVE_START := $(shell expr $(NOW) + 360) # GIVE ENOUGH TIME TO EXECUTE PREVIOUS TXS
-INCENTIVE_END := $(shell expr $(NOW) + 360 + 7776000) # 7776000 SECONDS = 90 DAY
+# INCENTIVE_START
+# TOMORROW_MIDNIGHT := $(shell date +%s) # DEV
+TOMORROW_MIDNIGHT := $(shell (gdate -ud 'tomorrow 00:00:00' +%s))
+INCENTIVE_END := $(shell expr $(TOMORROW_MIDNIGHT) + 7776000) # 7776000 SECONDS = 90 DAY
 
 
 MAKEFILE := $(shell realpath $(firstword $(MAKEFILE_LIST)))
 
-# GNOLAND_RPC_URL ?= localhost:26657
-GNOLAND_RPC_URL ?= localhost:26657 # 36657 for gnodev, 26657 for gnoland
+GNOLAND_RPC_URL ?= localhost:26657 
 CHAINID ?= dev
 ROOT_DIR:=$(shell dirname $(MAKEFILE))/../../
 
@@ -151,12 +151,12 @@ deploy-package-pool:
 # deploy common realms
 deploy-consts:
 	$(info ************ deploy consts ************)
-	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_deploy/r/gnoswap/consts -pkgpath gno.land/r/gnoswap/consts -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 10000000 -memo "" gnoswap_admin > /dev/null
+	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_deploy/r/demo/gnoswap/consts -pkgpath gno.land/r/demo/gnoswap/consts -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 10000000 -memo "" gnoswap_admin > /dev/null
 	@echo
 
 deploy-common:
 	$(info ************ deploy common ************)
-	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_deploy/r/gnoswap/common -pkgpath gno.land/r/gnoswap/common -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 10000000 -memo "" gnoswap_admin > /dev/null
+	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_deploy/r/demo/gnoswap/common -pkgpath gno.land/r/demo/gnoswap/common -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 10000000 -memo "" gnoswap_admin > /dev/null
 	@echo
 
 # deploy gnoswap realms
@@ -351,7 +351,7 @@ create-external-incentive:
 	@echo
 
 	# THEN CREATE EXTERNAL INCENTIVE
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/staker -func CreateExternalIncentive -args "gno.land/r/demo/foo:gno.land/r/demo/gns:500" -args "gno.land/r/demo/obl" -args 100000000000000 -args $(INCENTIVE_START) -args $(INCENTIVE_END) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gnoswap_admin > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/staker -func CreateExternalIncentive -args "gno.land/r/demo/foo:gno.land/r/demo/gns:500" -args "gno.land/r/demo/obl" -args 100000000000000 -args $(TOMORROW_MIDNIGHT) -args $(INCENTIVE_END) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gnoswap_admin > /dev/null
 	@echo
 
 

diff --git a/...ap/common/allow_non_gnoswap_contracts.gno → ...ap/common/allow_non_gnoswap_contracts.gno b/...ap/common/allow_non_gnoswap_contracts.gno → ...ap/common/allow_non_gnoswap_contracts.gno
@@ -3,7 +3,7 @@ package common
 import (
 	"std"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 )
 
 var (

diff --git a/_deploy/r/gnoswap/common/gno.mod → _deploy/r/demo/gnoswap/common/gno.mod b/_deploy/r/gnoswap/common/gno.mod → _deploy/r/demo/gnoswap/common/gno.mod
@@ -1,7 +1,7 @@
-module gno.land/r/gnoswap/common
+module gno.land/r/demo/gnoswap/common
 
 require (
 	gno.land/p/demo/gnoswap/int256 v0.0.0-latest
 	gno.land/p/demo/gnoswap/uint256 v0.0.0-latest
-	gno.land/r/gnoswap/consts v0.0.0-latest
+	gno.land/r/demo/gnoswap/consts v0.0.0-latest
 )
diff --git a/...oy/r/gnoswap/common/liquidity_amounts.gno → ...demo/gnoswap/common/liquidity_amounts.gno b/...oy/r/gnoswap/common/liquidity_amounts.gno → ...demo/gnoswap/common/liquidity_amounts.gno
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	u256 "gno.land/p/demo/gnoswap/uint256"
 )

diff --git a/_deploy/r/gnoswap/common/tick_math.gno → _deploy/r/demo/gnoswap/common/tick_math.gno b/_deploy/r/gnoswap/common/tick_math.gno → _deploy/r/demo/gnoswap/common/tick_math.gno
diff --git a/_deploy/r/gnoswap/consts/consts.gno → _deploy/r/demo/gnoswap/consts/consts.gno b/_deploy/r/gnoswap/consts/consts.gno → _deploy/r/demo/gnoswap/consts/consts.gno
diff --git a/_deploy/r/demo/gnoswap/consts/gno.mod b/_deploy/r/demo/gnoswap/consts/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/demo/gnoswap/consts
diff --git a/_deploy/r/demo/gns/gno.mod b/_deploy/r/demo/gns/gno.mod
@@ -5,5 +5,5 @@ require (
 	gno.land/p/demo/ufmt v0.0.0-latest
 	gno.land/p/demo/users v0.0.0-latest
 	gno.land/r/demo/users v0.0.0-latest
-	gno.land/r/gnoswap/consts v0.0.0-latest
+	gno.land/r/demo/gnoswap/consts v0.0.0-latest
 )
diff --git a/_deploy/r/demo/gns/gns.gno b/_deploy/r/demo/gns/gns.gno
@@ -10,7 +10,7 @@ import (
 
 	pusers "gno.land/p/demo/users"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 )
 
 const MAXIMUM_SUPPLY = uint64(1_000_000_000_000_000) // 1B

diff --git a/_deploy/r/gnoswap/consts/gno.mod b/_deploy/r/gnoswap/consts/gno.mod
diff --git a/gov/gno.mod b/gov/gno.mod
@@ -4,5 +4,5 @@ require (
 	gno.land/p/demo/ufmt v0.0.0-latest
 	gno.land/p/demo/users v0.0.0-latest
 	gno.land/r/demo/gns v0.0.0-latest
-	gno.land/r/gnoswap/consts v0.0.0-latest
+	gno.land/r/demo/gnoswap/consts v0.0.0-latest
 )
diff --git a/gov/gno_helper.gno b/gov/gno_helper.gno
@@ -3,7 +3,7 @@ package gov
 import (
 	"std"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 )
 
 func GetOrigPkgAddr() std.Address {

diff --git a/pool/_RPC_dry.gno b/pool/_RPC_dry.gno
@@ -1,9 +1,9 @@
 package pool
 
 import (
-	"gno.land/r/gnoswap/common"
+	"gno.land/r/demo/gnoswap/common"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	plp "gno.land/p/demo/gnoswap/pool" // pool package
 

diff --git a/pool/_TEST_/_TEST_0_INIT_TOKEN_REGISTER_test.gno b/pool/_TEST_/_TEST_0_INIT_TOKEN_REGISTER_test.gno
@@ -20,7 +20,7 @@ import (
 
 	"gno.land/r/demo/gns"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	pusers "gno.land/p/demo/users"
 )

diff --git a/pool/_TEST_/_TEST_0_INIT_VARIABLE_AND_HELPER_test.gno b/pool/_TEST_/_TEST_0_INIT_VARIABLE_AND_HELPER_test.gno
@@ -4,7 +4,7 @@ import (
 	"std"
 	"testing"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 )
 
 var (

diff --git a/pool/_TEST_/_TEST_pool_dryswap_and_swap_test.gn b/pool/_TEST_/_TEST_pool_dryswap_and_swap_test.gn
@@ -4,7 +4,7 @@ import (
 	"std"
 	"testing"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	"gno.land/r/demo/bar"
 	"gno.land/r/demo/foo"

diff --git a/pool/_TEST_/_TEST_pool_multi_token_test.gn b/pool/_TEST_/_TEST_pool_multi_token_test.gn
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"testing"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	"gno.land/r/demo/bar"
 	"gno.land/r/demo/baz"

diff --git a/pool/_TEST_/_TEST_pool_native_swap_test.gn b/pool/_TEST_/_TEST_pool_native_swap_test.gn
@@ -4,7 +4,7 @@ import (
 	"std"
 	"testing"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	"gno.land/r/demo/gns"
 

diff --git a/pool/_TEST_/_TEST_pool_single_lp_test.gn b/pool/_TEST_/_TEST_pool_single_lp_test.gn
@@ -9,7 +9,7 @@ import (
 	"gno.land/r/demo/foo"
 	"gno.land/r/demo/gns"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	"gno.land/p/demo/json"
 

diff --git a/pool/_TEST_/_TEST_pool_test.gn b/pool/_TEST_/_TEST_pool_test.gn
@@ -10,7 +10,7 @@ import (
 	"gno.land/r/demo/baz"
 	"gno.land/r/demo/foo"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	"gno.land/r/demo/gns"
 )

diff --git a/pool/_TEST_/z0_rpc_filetest.gno b/pool/_TEST_/z0_rpc_filetest.gno
@@ -15,7 +15,7 @@ import (
 	"gno.land/p/demo/json"
 	pusers "gno.land/p/demo/users"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	pl "gno.land/r/demo/pool"
 )

diff --git a/pool/_TEST_/z1_single_lp_filetest.gno b/pool/_TEST_/z1_single_lp_filetest.gno
@@ -15,7 +15,7 @@ import (
 	"gno.land/p/demo/json"
 	pusers "gno.land/p/demo/users"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	pl "gno.land/r/demo/pool"
 )

diff --git a/pool/emergency_halt.gno b/pool/emergency_halt.gno
@@ -4,7 +4,7 @@ import (
 	"std"
 
 	"gno.land/p/demo/ufmt"
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 )
 
 var (

diff --git a/pool/gno.mod b/pool/gno.mod
@@ -9,6 +9,6 @@ require (
 	gno.land/p/demo/users v0.0.0-latest
 	gno.land/r/demo/gns v0.0.0-latest
 	gno.land/r/demo/gov v0.0.0-latest
-	gno.land/r/gnoswap/common v0.0.0-latest
-	gno.land/r/gnoswap/consts v0.0.0-latest
+	gno.land/r/demo/gnoswap/common v0.0.0-latest
+	gno.land/r/demo/gnoswap/consts v0.0.0-latest
 )
diff --git a/pool/pool.gno b/pool/pool.gno
@@ -7,8 +7,8 @@ import (
 
 	plp "gno.land/p/demo/gnoswap/pool"
 
-	"gno.land/r/gnoswap/common"
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/common"
+	"gno.land/r/demo/gnoswap/consts"
 
 	gv "gno.land/r/demo/gov"
 

diff --git a/pool/pool_manager.gno b/pool/pool_manager.gno
@@ -6,8 +6,8 @@ import (
 
 	"gno.land/p/demo/ufmt"
 
-	"gno.land/r/gnoswap/common"
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/common"
+	"gno.land/r/demo/gnoswap/consts"
 
 	"gno.land/r/demo/gns"
 

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

diff --git a/pool/position_modify.gno b/pool/position_modify.gno
@@ -1,7 +1,7 @@
 package pool
 
 import (
-	"gno.land/r/gnoswap/common"
+	"gno.land/r/demo/gnoswap/common"
 
 	i256 "gno.land/p/demo/gnoswap/int256"
 

diff --git a/pool/tick.gno b/pool/tick.gno
@@ -1,7 +1,7 @@
 package pool
 
 import (
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	i256 "gno.land/p/demo/gnoswap/int256"
 	u256 "gno.land/p/demo/gnoswap/uint256"

diff --git a/pool/tick_bitmap.gno b/pool/tick_bitmap.gno
@@ -2,7 +2,7 @@ package pool
 
 import (
 	"gno.land/p/demo/ufmt"
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 
 	plp "gno.land/p/demo/gnoswap/pool"
 

diff --git a/pool/token_register.gno b/pool/token_register.gno
@@ -7,7 +7,7 @@ import (
 
 	pusers "gno.land/p/demo/users"
 
-	"gno.land/r/gnoswap/consts"
+	"gno.land/r/demo/gnoswap/consts"
 )
 
 // GRC20Interface is the interface for GRC20 tokens