diff --git a/_setup/gns/gns.gno b/_setup/gns/gns.gno
index eb7932d0a..bb039fbba 100644
--- a/_setup/gns/gns.gno
+++ b/_setup/gns/gns.gno
@@ -24,6 +24,8 @@ func init() {
 	stakerAddr := std.DerivePkgAddr("gno.land/r/demo/staker")
 	admins = append(admins, string(stakerAddr))
 	admins = append(admins, string(admin))
+
+	gns.Approve(ira, stakerAddr, 9_223_372_036_854_775_807) // max uint64
 }
 
 // method proxies as public functions.
diff --git a/_setup/grc20_wrapper/gno.mod b/_setup/grc20_wrapper_init/gno.mod
similarity index 100%
rename from _setup/grc20_wrapper/gno.mod
rename to _setup/grc20_wrapper_init/gno.mod
diff --git a/_setup/grc20_wrapper/grc20wrapper.gno b/_setup/grc20_wrapper_init/grc20wrapper.gno
similarity index 100%
rename from _setup/grc20_wrapper/grc20wrapper.gno
rename to _setup/grc20_wrapper_init/grc20wrapper.gno
diff --git a/_setup/grc20_wrapper/wrapper_bar.gno b/_setup/grc20_wrapper_init/wrapper_bar.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_bar.gno
rename to _setup/grc20_wrapper_init/wrapper_bar.gno
diff --git a/_setup/grc20_wrapper/wrapper_baz.gno b/_setup/grc20_wrapper_init/wrapper_baz.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_baz.gno
rename to _setup/grc20_wrapper_init/wrapper_baz.gno
diff --git a/_setup/grc20_wrapper/wrapper_foo.gno b/_setup/grc20_wrapper_init/wrapper_foo.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_foo.gno
rename to _setup/grc20_wrapper_init/wrapper_foo.gno
diff --git a/_setup/grc20_wrapper/wrapper_gns.gno b/_setup/grc20_wrapper_init/wrapper_gns.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_gns.gno
rename to _setup/grc20_wrapper_init/wrapper_gns.gno
diff --git a/_setup/grc20_wrapper/wrapper_obl.gno b/_setup/grc20_wrapper_init/wrapper_obl.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_obl.gno
rename to _setup/grc20_wrapper_init/wrapper_obl.gno
diff --git a/_setup/grc20_wrapper/wrapper_qux.gno b/_setup/grc20_wrapper_init/wrapper_qux.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_qux.gno
rename to _setup/grc20_wrapper_init/wrapper_qux.gno
diff --git a/_setup/grc20_wrapper/wrapper_st1.gno b/_setup/grc20_wrapper_init/wrapper_st1.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_st1.gno
rename to _setup/grc20_wrapper_init/wrapper_st1.gno
diff --git a/_setup/grc20_wrapper/wrapper_st2.gno b/_setup/grc20_wrapper_init/wrapper_st2.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_st2.gno
rename to _setup/grc20_wrapper_init/wrapper_st2.gno
diff --git a/_setup/grc20_wrapper/wrapper_st3.gno b/_setup/grc20_wrapper_init/wrapper_st3.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_st3.gno
rename to _setup/grc20_wrapper_init/wrapper_st3.gno
diff --git a/_setup/grc20_wrapper/wrapper_st4.gno b/_setup/grc20_wrapper_init/wrapper_st4.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_st4.gno
rename to _setup/grc20_wrapper_init/wrapper_st4.gno
diff --git a/_setup/grc20_wrapper/wrapper_st5.gno b/_setup/grc20_wrapper_init/wrapper_st5.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_st5.gno
rename to _setup/grc20_wrapper_init/wrapper_st5.gno
diff --git a/_setup/grc20_wrapper/wrapper_wugnot.gno b/_setup/grc20_wrapper_init/wrapper_wugnot.gno
similarity index 100%
rename from _setup/grc20_wrapper/wrapper_wugnot.gno
rename to _setup/grc20_wrapper_init/wrapper_wugnot.gno
diff --git a/_setup/grc20_wrapper_test/gno.mod b/_setup/grc20_wrapper_test/gno.mod
new file mode 100644
index 000000000..04743c5b1
--- /dev/null
+++ b/_setup/grc20_wrapper_test/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/demo/grc20_wrapper
\ No newline at end of file
diff --git a/_setup/grc20_wrapper_test/grc20wrapper.gno b/_setup/grc20_wrapper_test/grc20wrapper.gno
new file mode 100644
index 000000000..a894a789e
--- /dev/null
+++ b/_setup/grc20_wrapper_test/grc20wrapper.gno
@@ -0,0 +1,37 @@
+package grc20wrapper
+
+import (
+	pRegistry "gno.land/r/demo/pool"
+	rRegistry "gno.land/r/demo/router"
+	sRegistry "gno.land/r/demo/staker"
+)
+
+func init() {
+	pRegistry.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotTokenInterface{})
+	rRegistry.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotTokenInterface{})
+	sRegistry.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotTokenInterface{})
+
+	pRegistry.RegisterGRC20Interface("gno.land/r/demo/bar", BarTokenInterface{})
+	rRegistry.RegisterGRC20Interface("gno.land/r/demo/bar", BarTokenInterface{})
+	sRegistry.RegisterGRC20Interface("gno.land/r/demo/bar", BarTokenInterface{})
+
+	pRegistry.RegisterGRC20Interface("gno.land/r/demo/baz", BazTokenInterface{})
+	rRegistry.RegisterGRC20Interface("gno.land/r/demo/baz", BazTokenInterface{})
+	sRegistry.RegisterGRC20Interface("gno.land/r/demo/baz", BazTokenInterface{})
+
+	pRegistry.RegisterGRC20Interface("gno.land/r/demo/foo", FooTokenInterface{})
+	rRegistry.RegisterGRC20Interface("gno.land/r/demo/foo", FooTokenInterface{})
+	sRegistry.RegisterGRC20Interface("gno.land/r/demo/foo", FooTokenInterface{})
+
+	pRegistry.RegisterGRC20Interface("gno.land/r/demo/gns", GnsTokenInterface{})
+	rRegistry.RegisterGRC20Interface("gno.land/r/demo/gns", GnsTokenInterface{})
+	sRegistry.RegisterGRC20Interface("gno.land/r/demo/gns", GnsTokenInterface{})
+
+	pRegistry.RegisterGRC20Interface("gno.land/r/demo/obl", OblTokenInterface{})
+	rRegistry.RegisterGRC20Interface("gno.land/r/demo/obl", OblTokenInterface{})
+	sRegistry.RegisterGRC20Interface("gno.land/r/demo/obl", OblTokenInterface{})
+
+	pRegistry.RegisterGRC20Interface("gno.land/r/demo/qux", QuxTokenInterface{})
+	rRegistry.RegisterGRC20Interface("gno.land/r/demo/qux", QuxTokenInterface{})
+	sRegistry.RegisterGRC20Interface("gno.land/r/demo/qux", QuxTokenInterface{})
+}
diff --git a/_setup/grc20_wrapper_test/wrapper_bar.gno b/_setup/grc20_wrapper_test/wrapper_bar.gno
new file mode 100644
index 000000000..52a48bf48
--- /dev/null
+++ b/_setup/grc20_wrapper_test/wrapper_bar.gno
@@ -0,0 +1,33 @@
+package grc20wrapper
+
+import (
+	"gno.land/r/demo/users"
+
+	"gno.land/r/demo/bar"
+
+	pRegistry "gno.land/r/demo/pool"
+	rRegistry "gno.land/r/demo/router"
+	sRegistry "gno.land/r/demo/staker"
+)
+
+type BarTokenInterface struct{}
+
+func (BarTokenInterface) Transfer() func(to users.AddressOrName, amount uint64) {
+	return bar.Transfer
+}
+
+func (BarTokenInterface) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
+	return bar.TransferFrom
+}
+
+func (BarTokenInterface) BalanceOf() func(owner users.AddressOrName) uint64 {
+	return bar.BalanceOf
+}
+
+func (BarTokenInterface) Approve() func(spender users.AddressOrName, amount uint64) {
+	return bar.Approve
+}
+
+var _ pRegistry.GRC20Interface = BarTokenInterface{}
+var _ rRegistry.GRC20Interface = BarTokenInterface{}
+var _ sRegistry.GRC20Interface = BarTokenInterface{}
diff --git a/_setup/grc20_wrapper_test/wrapper_baz.gno b/_setup/grc20_wrapper_test/wrapper_baz.gno
new file mode 100644
index 000000000..03c803811
--- /dev/null
+++ b/_setup/grc20_wrapper_test/wrapper_baz.gno
@@ -0,0 +1,33 @@
+package grc20wrapper
+
+import (
+	"gno.land/r/demo/users"
+
+	"gno.land/r/demo/baz"
+
+	pRegistry "gno.land/r/demo/pool"
+	rRegistry "gno.land/r/demo/router"
+	sRegistry "gno.land/r/demo/staker"
+)
+
+type BazTokenInterface struct{}
+
+func (BazTokenInterface) Transfer() func(to users.AddressOrName, amount uint64) {
+	return baz.Transfer
+}
+
+func (BazTokenInterface) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
+	return baz.TransferFrom
+}
+
+func (BazTokenInterface) BalanceOf() func(owner users.AddressOrName) uint64 {
+	return baz.BalanceOf
+}
+
+func (BazTokenInterface) Approve() func(spender users.AddressOrName, amount uint64) {
+	return baz.Approve
+}
+
+var _ pRegistry.GRC20Interface = BazTokenInterface{}
+var _ rRegistry.GRC20Interface = BazTokenInterface{}
+var _ sRegistry.GRC20Interface = BazTokenInterface{}
diff --git a/_setup/grc20_wrapper_test/wrapper_foo.gno b/_setup/grc20_wrapper_test/wrapper_foo.gno
new file mode 100644
index 000000000..6f0701553
--- /dev/null
+++ b/_setup/grc20_wrapper_test/wrapper_foo.gno
@@ -0,0 +1,33 @@
+package grc20wrapper
+
+import (
+	"gno.land/r/demo/users"
+
+	"gno.land/r/demo/foo"
+
+	pRegistry "gno.land/r/demo/pool"
+	rRegistry "gno.land/r/demo/router"
+	sRegistry "gno.land/r/demo/staker"
+)
+
+type FooTokenInterface struct{}
+
+func (FooTokenInterface) Transfer() func(to users.AddressOrName, amount uint64) {
+	return foo.Transfer
+}
+
+func (FooTokenInterface) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
+	return foo.TransferFrom
+}
+
+func (FooTokenInterface) BalanceOf() func(owner users.AddressOrName) uint64 {
+	return foo.BalanceOf
+}
+
+func (FooTokenInterface) Approve() func(spender users.AddressOrName, amount uint64) {
+	return foo.Approve
+}
+
+var _ pRegistry.GRC20Interface = FooTokenInterface{}
+var _ rRegistry.GRC20Interface = FooTokenInterface{}
+var _ sRegistry.GRC20Interface = FooTokenInterface{}
diff --git a/_setup/grc20_wrapper_test/wrapper_gns.gno b/_setup/grc20_wrapper_test/wrapper_gns.gno
new file mode 100644
index 000000000..faae2c2d7
--- /dev/null
+++ b/_setup/grc20_wrapper_test/wrapper_gns.gno
@@ -0,0 +1,33 @@
+package grc20wrapper
+
+import (
+	"gno.land/r/demo/users"
+
+	"gno.land/r/demo/gns"
+
+	pRegistry "gno.land/r/demo/pool"
+	rRegistry "gno.land/r/demo/router"
+	sRegistry "gno.land/r/demo/staker"
+)
+
+type GnsTokenInterface struct{}
+
+func (GnsTokenInterface) Transfer() func(to users.AddressOrName, amount uint64) {
+	return gns.Transfer
+}
+
+func (GnsTokenInterface) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
+	return gns.TransferFrom
+}
+
+func (GnsTokenInterface) BalanceOf() func(owner users.AddressOrName) uint64 {
+	return gns.BalanceOf
+}
+
+func (GnsTokenInterface) Approve() func(spender users.AddressOrName, amount uint64) {
+	return gns.Approve
+}
+
+var _ pRegistry.GRC20Interface = GnsTokenInterface{}
+var _ rRegistry.GRC20Interface = GnsTokenInterface{}
+var _ sRegistry.GRC20Interface = GnsTokenInterface{}
diff --git a/_setup/grc20_wrapper_test/wrapper_obl.gno b/_setup/grc20_wrapper_test/wrapper_obl.gno
new file mode 100644
index 000000000..747a1b37d
--- /dev/null
+++ b/_setup/grc20_wrapper_test/wrapper_obl.gno
@@ -0,0 +1,33 @@
+package grc20wrapper
+
+import (
+	"gno.land/r/demo/users"
+
+	"gno.land/r/demo/obl"
+
+	pRegistry "gno.land/r/demo/pool"
+	rRegistry "gno.land/r/demo/router"
+	sRegistry "gno.land/r/demo/staker"
+)
+
+type OblTokenInterface struct{}
+
+func (OblTokenInterface) Transfer() func(to users.AddressOrName, amount uint64) {
+	return obl.Transfer
+}
+
+func (OblTokenInterface) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
+	return obl.TransferFrom
+}
+
+func (OblTokenInterface) BalanceOf() func(owner users.AddressOrName) uint64 {
+	return obl.BalanceOf
+}
+
+func (OblTokenInterface) Approve() func(spender users.AddressOrName, amount uint64) {
+	return obl.Approve
+}
+
+var _ pRegistry.GRC20Interface = OblTokenInterface{}
+var _ rRegistry.GRC20Interface = OblTokenInterface{}
+var _ sRegistry.GRC20Interface = OblTokenInterface{}
diff --git a/_setup/grc20_wrapper_test/wrapper_qux.gno b/_setup/grc20_wrapper_test/wrapper_qux.gno
new file mode 100644
index 000000000..08315b7fa
--- /dev/null
+++ b/_setup/grc20_wrapper_test/wrapper_qux.gno
@@ -0,0 +1,33 @@
+package grc20wrapper
+
+import (
+	"gno.land/r/demo/users"
+
+	"gno.land/r/demo/qux"
+
+	pRegistry "gno.land/r/demo/pool"
+	rRegistry "gno.land/r/demo/router"
+	sRegistry "gno.land/r/demo/staker"
+)
+
+type QuxTokenInterface struct{}
+
+func (QuxTokenInterface) Transfer() func(to users.AddressOrName, amount uint64) {
+	return qux.Transfer
+}
+
+func (QuxTokenInterface) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
+	return qux.TransferFrom
+}
+
+func (QuxTokenInterface) BalanceOf() func(owner users.AddressOrName) uint64 {
+	return qux.BalanceOf
+}
+
+func (QuxTokenInterface) Approve() func(spender users.AddressOrName, amount uint64) {
+	return qux.Approve
+}
+
+var _ pRegistry.GRC20Interface = QuxTokenInterface{}
+var _ rRegistry.GRC20Interface = QuxTokenInterface{}
+var _ sRegistry.GRC20Interface = QuxTokenInterface{}
diff --git a/_setup/grc20_wrapper_test/wrapper_wugnot.gno b/_setup/grc20_wrapper_test/wrapper_wugnot.gno
new file mode 100644
index 000000000..277395fb0
--- /dev/null
+++ b/_setup/grc20_wrapper_test/wrapper_wugnot.gno
@@ -0,0 +1,33 @@
+package grc20wrapper
+
+import (
+	"gno.land/r/demo/users"
+
+	"gno.land/r/demo/wugnot"
+
+	pRegistry "gno.land/r/demo/pool"
+	rRegistry "gno.land/r/demo/router"
+	sRegistry "gno.land/r/demo/staker"
+)
+
+type WugnotTokenInterface struct{}
+
+func (WugnotTokenInterface) Transfer() func(to users.AddressOrName, amount uint64) {
+	return wugnot.Transfer
+}
+
+func (WugnotTokenInterface) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
+	return wugnot.TransferFrom
+}
+
+func (WugnotTokenInterface) BalanceOf() func(owner users.AddressOrName) uint64 {
+	return wugnot.BalanceOf
+}
+
+func (WugnotTokenInterface) Approve() func(spender users.AddressOrName, amount uint64) {
+	return wugnot.Approve
+}
+
+var _ pRegistry.GRC20Interface = WugnotTokenInterface{}
+var _ rRegistry.GRC20Interface = WugnotTokenInterface{}
+var _ sRegistry.GRC20Interface = WugnotTokenInterface{}
diff --git a/_setup/wugnot/wugnot.gno b/_setup/wugnot/wugnot.gno
index 19dad01fd..1f48a10ec 100644
--- a/_setup/wugnot/wugnot.gno
+++ b/_setup/wugnot/wugnot.gno
@@ -12,14 +12,12 @@ import (
 
 var (
 	// wugnot is the admin token, able to mint and burn.
-	// wugnot *grc20.AdminToken = grc20.NewAdminToken("wrapped GNOT", "wugnot", 0) // orig
-	wugnot *grc20.AdminToken = grc20.NewAdminToken("Wrapped GNOT", "wugnot", 6)
+	wugnot *grc20.AdminToken = grc20.NewAdminToken("WrappedGNOT", "WGNOT", 6)
 
 	// WUGNOT is the banker usable by users directly.
 	WUGNOT = wugnot.GRC20()
 )
 
-
 const (
 	ugnotMinDeposit  uint64 = 1
 	wugnotMinDeposit uint64 = 1
diff --git a/_test/init_only.mk b/_test/init_only.mk
index d490a220c..ef0640068 100644
--- a/_test/init_only.mk
+++ b/_test/init_only.mk
@@ -63,7 +63,6 @@ deploy-gnft:
 	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_setup/gnft -pkgpath gno.land/r/demo/gnft -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo
 
-
 # Deploy Contracts
 deploy-gov:
 	$(info ************ [GOV] deploy governance ************)
@@ -92,7 +91,7 @@ deploy-router:
 
 deploy-grc20_wrapper:
 	$(info ************ [GRC20 Wrapper] deploy grc20_wrapper ************)
-	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_setup/grc20_wrapper -pkgpath gno.land/r/demo/grc20_wrapper -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
+	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_setup/grc20_wrapper_init -pkgpath gno.land/r/demo/grc20_wrapper -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo
 
 
@@ -107,11 +106,6 @@ approve-test1:
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/gns -func Approve -args $(ADDR_POOL) -args 500000000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/obl -func Approve -args $(ADDR_POOL) -args 500000000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Approve -args $(ADDR_POOL) -args 500000000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/st1 -func Approve -args $(ADDR_POOL) -args 500000000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/st2 -func Approve -args $(ADDR_POOL) -args 500000000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/st3 -func Approve -args $(ADDR_POOL) -args 500000000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/st4 -func Approve -args $(ADDR_POOL) -args 500000000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/st5 -func Approve -args $(ADDR_POOL) -args 500000000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo
 
 
@@ -128,36 +122,6 @@ pool-create:
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/baz" -args "gno.land/r/demo/foo" -args 100 -args 177166786517138269218369076073 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/gns" -args "gno.land/r/demo/wugnot" -args 100 -args 79228162514264337593543950337 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/gns" -args "gno.land/r/demo/qux" -args 100 -args 250553947533412109193337304115 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st2" -args 100 -args 78636203513782394569765110859 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st2" -args 3000 -args 79816596014554786537349811406 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st3" -args 500 -args 114963330138887223051344675935 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st3" -args 10000 -args 114127195240248353140234912719 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st4" -args 100 -args 96223355229883343171379415442 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st4" -args 3000 -args 94577818186581255193903899028 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st5" -args 500 -args 105553452024597856248239970211 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st5" -args 10000 -args 104060055720203537188615070492 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st3" -args 100 -args 114951834955391683882956380297 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st3" -args 3000 -args 113575045994529217799398739318 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st4" -args 500 -args 93744538858360434067702382727 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st4" -args 10000 -args 98639408880844237329631226990 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st5" -args 100 -args 107046870051799045081314970900 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st5" -args 3000 -args 103303220962225903261255492424 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st3" -args "gno.land/r/demo/st4" -args 500 -args 65597741190543616110355062640 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st3" -args "gno.land/r/demo/st4" -args 10000 -args 64634091399937790156998403932 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st3" -args "gno.land/r/demo/st5" -args 100 -args 71936706074190924971728256808 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st3" -args "gno.land/r/demo/st5" -args 3000 -args 71238766072602061195894228565 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st4" -args "gno.land/r/demo/st5" -args 500 -args 87350341247483919659585300674 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/st4" -args "gno.land/r/demo/st5" -args 10000 -args 86446650220495278410339891092 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo
 
 
@@ -171,36 +135,6 @@ position-mint:
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/baz" -args "gno.land/r/demo/foo" -args 100 -args 15096 -args 17096 -args 1000000000 -args 10000000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/gns" -args "gno.land/r/demo/wugnot" -args 100 -args -1000 -args 1000 -args 1000000000 -args 1000000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/gns" -args "gno.land/r/demo/qux" -args 100 -args 22028 -args 24028 -args 1000000000 -args 1000000000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st2" -args 100 -args -14016 -args 2080 -args 40000000000 -args 186543000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st2" -args 3000 -args 1560 -args 14640 -args 160000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st3" -args 500 -args -6420 -args 9680 -args 150000000000 -args 1492690000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st3" -args 10000 -args 8600 -args 21800 -args 850000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st4" -args 100 -args -9976 -args 6120 -args 20000000000 -args 139685000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st4" -args 3000 -args 4920 -args 18000 -args 180000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st5" -args 500 -args -8130 -args 7970 -args 350000000000 -args 2943960000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st1" -args "gno.land/r/demo/st5" -args 10000 -args 6800 -args 20000 -args 650000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st3" -args 100 -args -6420 -args 9676 -args 80000000000 -args 797115000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st3" -args 3000 -args 8580 -args 21660 -args 120000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st4" -args 500 -args -10500 -args 5600 -args 90000000000 -args 595920000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st4" -args 10000 -args 5800 -args 18800 -args 110000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st5" -args 100 -args -7846 -args 8248 -args 170000000000 -args 1468390000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st2" -args "gno.land/r/demo/st5" -args 3000 -args 6720 -args 19800 -args 30000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st3" -args "gno.land/r/demo/st4" -args 500 -args -17640 -args -1540 -args 10000000000 -args 32406000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st3" -args "gno.land/r/demo/st4" -args 10000 -args -2600 -args 10400 -args 190000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st3" -args "gno.land/r/demo/st5" -args 100 -args -15796 -args 300 -args 250000000000 -args 975796000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st3" -args "gno.land/r/demo/st5" -args 3000 -args -720 -args 12360 -args 750000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st4" -args "gno.land/r/demo/st5" -args 500 -args -11910 -args 4180 -args 5000000000 -args 28808800000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/st4" -args "gno.land/r/demo/st5" -args 10000 -args 3200 -args 16200 -args 195000000000 -args 0 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo
 
 
diff --git a/_test/live_test.mk b/_test/live_test.mk
index 9ed045b10..0f80e113b 100644
--- a/_test/live_test.mk
+++ b/_test/live_test.mk
@@ -21,8 +21,8 @@ ADDR_GOV := g1kmat25auuqf0h5qvd4q7s707r8let5sky4tr76
 TX_EXPIRE := 9999999999
 
 NOW := $(shell date +%s)
-INCENTIVE_START := $(shell expr $(NOW) + 120)
-INCENTIVE_END := $(shell expr $(NOW) + 7776000) # 90 DAY
+INCENTIVE_START := $(shell expr $(NOW) + 140)
+INCENTIVE_END := $(shell expr $(NOW) + 140 + 7776000) # 90 DAY
 
 MAKEFILE := $(shell realpath $(firstword $(MAKEFILE_LIST)))
 GNOLAND_RPC_URL ?= localhost:26657
@@ -50,23 +50,21 @@ approve: approve-lp01 approve-lp02 approve-tr01 approve-gsa
 pool-setup: pool-init pool-create
 
 .PHONY: position-mint
-position-mint: mint-01 mint-02 mint-03 mint-rest
+position-mint: wrap mint-01 mint-02 mint-03
 
 .PHONY: staker-stake
-staker-stake: stake-token-1 stake-token-2
+staker-stake: create-external-incentive stake-token-1 stake-token-2
 
 .PHONY: router-swap
 router-swap: set-protocol-fee swap-exact-in-single swap-exact-out-multi collect-lp01 collect-lp02
 
 .PHONY: staker-unstake
-staker-unstake: unstake-token-1 unstake-token-2
+staker-unstake: unstake-token-1 # unstake-token-2
+
+.PHONY: stake-test
+stake-test: deploy faucet-gsa approve-gsa pool-setup create-external-incentive faucet-lp01 approve-lp01 faucet-lp02 approve-lp02 wrap mint-01 mint-02 stake-token-1 stake-token-2
 
 # Deploy Tokens
-# [GRC20] FOO, BAR, BAZ, QUX: Token Pair for Pool
-# [GRC20] WUGNOT: Wrapped GRC20 for native ugnot
-# [GRC20] GNS: Default Staking Reward
-# [GRC20] OBL: External Staking Reward
-# [GRC721] GNFT: LP Token
 deploy-foo:
 	$(info ************ [FOO] deploy foo ************)
 	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_setup/foo -pkgpath gno.land/r/demo/foo -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
@@ -136,77 +134,79 @@ deploy-router:
 
 deploy-grc20_wrapper:
 	$(info ************ [GRC20 Wrapper] deploy grc20_wrapper ************)
-	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_setup/grc20_wrapper -pkgpath gno.land/r/demo/grc20_wrapper -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
+	@echo "" | gnokey maketx addpkg -pkgdir $(ROOT_DIR)/_setup/grc20_wrapper_test -pkgpath gno.land/r/demo/grc20_wrapper -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
 	@echo
 
 
 # Facuet Tokens
 faucet-lp01:
-	$(info ************ [FAUCET] foo & bar & baz & qux & wugnot to lp01 ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	$(info ************ [FAUCET] foo & bar & baz & qux to lp01 ************)
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
 	@echo
 
 faucet-lp02:
-	$(info ************ [FAUCET] foo & bar & baz & qux & wugnot to lp02 ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	$(info ************ [FAUCET] foo & bar & baz & qux to lp02 ************)
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
 	@echo
 
 faucet-tr01:
-	$(info ************ [FAUCET] foo & bar & baz & qux & wugnot to tr01 ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	$(info ************ [FAUCET] foo & bar & baz & qux to tr01 ************)
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
 	@echo
 
 faucet-gsa:
-	$(info ************ [FAUCET] foo & bar & baz & qux & wugnot & gns to gsa ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/gns -func FaucetL -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	$(info ************ [FAUCET] foo & bar & baz & qux & gns & obl to gsa ************)
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/gns -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/obl -func Faucet -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
 	@echo
 
 
 # Approve Tokens
 approve-lp01:
 	$(info ************ [APPROVE] foo & bar & baz & qux & wugnot from lp01 to pool ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
 	@echo
 
 approve-lp02:
 	$(info ************ [APPROVE] foo & bar & baz & qux & wugnot from lp02 to pool ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
 	@echo
 
 approve-tr01:
 	$(info ************ [APPROVE] foo & bar & baz & qux & wugnot from tr01 to pool ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/foo -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/bar -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/baz -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/qux -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
 	@echo
 
 approve-gsa:
-	$(info ************ [APPROVE] from gsa (gns to pool, wugnot to staker) ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/gns -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Approve -args $(ADDR_STAKER) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	$(info ************ [APPROVE] from gsa (gns to pool // wugnot, obl to staker) ************)
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/gns -func Approve -args $(ADDR_POOL) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Approve -args $(ADDR_STAKER) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/obl -func Approve -args $(ADDR_STAKER) -args 1000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
 	@echo
 
 
@@ -218,20 +218,25 @@ pool-init:
 
 pool-create:
 	$(info ************ [POOL] create pools ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gnot" -args "gno.land/r/demo/bar" -args 100 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/wugnot" -args "gno.land/r/demo/bar" -args 100 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/bar" -args "gno.land/r/demo/baz" -args 100 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/baz" -args "gno.land/r/demo/qux" -args 100 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
-
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gnot" -args "gno.land/r/demo/bar" -args 500 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/bar" -args "gno.land/r/demo/baz" -args 500 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/pool -func CreatePool -args "gno.land/r/demo/baz" -args "gno.land/r/demo/qux" -args 500 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
 	@echo
 
 
 # Position
+wrap:
+	$(info ************ [WUGNOT] wrap test1, lp01, lp02, tr01 ************)
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Deposit -send "10000000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Deposit -send "10000000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Deposit -send "10000000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Deposit -send "10000000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo
+
+
 mint-01:
 	$(info ************ [POSITION - 1] mint gnot & bar // tick range 4000 ~ 6000 // by lp01 ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gnot" -args "gno.land/r/demo/bar" -args 100 -args 4000 -args 6000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -send "10000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/wugnot" -args "gno.land/r/demo/bar" -args 100 -args 4000 -args 6000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
 	@echo
 
 mint-02:
@@ -244,18 +249,10 @@ mint-03:
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/baz" -args "gno.land/r/demo/qux" -args 100 -args 4000 -args 6000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
 	@echo
 
-mint-rest:
-	$(info ************ [POSITION - 4,5,6] ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/bar" -args "gnot" -args 500 -args -6000 -args -4000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -send "10000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/bar" -args "gno.land/r/demo/baz" -args 500 -args 4000 -args 6000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func Mint -args "gno.land/r/demo/baz" -args "gno.land/r/demo/qux" -args 500 -args 4000 -args 6000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
-	@echo
-
-
 # Staker
 create-external-incentive:
 	$(info ************ [STAKER] create external incentive ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/staker -func CreateExternalIncentive -args "gno.land/r/demo/bar:gnot:100" -args "gno.land/r/demo/obl" -args 10000000000 -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 "" gsa > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/staker -func CreateExternalIncentive -args "gno.land/r/demo/bar:gno.land/r/demo/baz:100" -args "gno.land/r/demo/obl" -args 10000000 -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 "" gsa > /dev/null
 	@echo
 
 stake-token-1:
@@ -286,7 +283,7 @@ swap-exact-in-single:
 
 swap-exact-out-multi:
 	$(info ************ [ROUTER] Swap NATIVE ugnot to 987_654 QUX // multiPath ************)
-	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/router -func SwapRoute -args "gnot" -args "gno.land/r/demo/qux" -args 987654  -args "EXACT_OUT" -args "gnot:gno.land/r/demo/bar:100*POOL*gno.land/r/demo/bar:gno.land/r/demo/baz:100*POOL*gno.land/r/demo/baz:gno.land/r/demo/qux:100,gnot:gno.land/r/demo/bar:500*POOL*gno.land/r/demo/bar:gno.land/r/demo/baz:500*POOL*gno.land/r/demo/baz:gno.land/r/demo/qux:500" -args "40,60" -args 654321 -send 100000000ugnot -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/router -func SwapRoute -args "gno.land/r/demo/wugnot" -args "gno.land/r/demo/qux" -args 987654  -args "EXACT_OUT" -args "gno.land/r/demo/wugnot:gno.land/r/demo/bar:100*POOL*gno.land/r/demo/bar:gno.land/r/demo/baz:100*POOL*gno.land/r/demo/baz:gno.land/r/demo/qux:100" -args "100" -args 654321 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
 	@echo
 
 collect-lp01:
@@ -313,6 +310,13 @@ unstake-token-2:
 	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/staker -func UnstakeToken -args 2 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
 	@echo
 
+
+## EXTRA
+decrease-liquidity:
+	$(info ************ [POSITION] Decrease Liquidity ************)
+	@echo "" | gnokey maketx call -pkgpath gno.land/r/demo/position -func DecreaseLiquidity -args 1 -args 999999999999999999999999 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid "dev.gnoswap" -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
+	
+
 ### can not test staker EndExternalIncentive
 ### it needs to wait for 90 days ( which we can't skip it in makefiles )