Merge pull request #81 from gnoswap-labs/GSW-530-feat-swap-router

GSW-530 feat: swap router
gnoswap-labs · Nov 7, 2023 · 030936c · 030936c
2 parents fa5d90d + cb16f6a
commit 030936c
Show file tree

Hide file tree

Showing 59 changed files with 3,599 additions and 1,818 deletions.
diff --git a/_setup/bar/bar.gno b/_setup/bar/bar.gno
@@ -31,22 +31,17 @@ func init() {
 		posAddr  = std.DerivePkgAddr("gno.land/r/position")
 	)
 
-	bar.Mint(lp01, 50000000)
-	bar.Mint(lp02, 50000000)
-	bar.Mint(lp03, 50000000)
-	bar.Mint(tr01, 50000000)
-
-	bar.Approve(lp01, poolAddr, 50000000)
-	// bar.Approve(lp02, poolAddr, 50000000)
-	// bar.Approve(lp03, poolAddr, 50000000)
-	bar.Approve(tr01, poolAddr, 50000000)
-
-	// bar.Approve(lp01, lp01, 50000000)
-	// bar.Approve(lp02, lp02, 50000000)
-	// bar.Approve(lp03, lp03, 50000000)
-	// bar.Approve(tr01, tr01, 50000000)
-
-	// bar.Approve(poolAddr, registryAddr, 50000000)
+	bar.Mint(lp01, 50000000000)
+	bar.Mint(lp02, 50000000000)
+	bar.Mint(lp03, 50000000000)
+	bar.Mint(tr01, 50000000000)
+
+	bar.Approve(lp01, poolAddr, 50000000000)
+	bar.Approve(lp02, poolAddr, 50000000000)
+	bar.Approve(lp03, poolAddr, 50000000000)
+	bar.Approve(tr01, poolAddr, 50000000000)
+
+	// bar.Approve(poolAddr, registryAddr, 50000000000)
 }
 
 // method proxies as public functions.
@@ -117,7 +112,7 @@ func FaucetL() {
 	// FIXME: add limits?
 	// FIXME: add payment in gnot?
 	caller := std.PrevRealm().Addr()
-	bar.Mint(caller, 50000000000) // 50_000_000_000
+	bar.Mint(caller, 50000000000000) // 50_000_000_000
 }
 
 // administration.

diff --git a/_setup/baz/baz.gno b/_setup/baz/baz.gno
@@ -31,22 +31,17 @@ func init() {
 		posAddr  = std.DerivePkgAddr("gno.land/r/position")
 	)
 
-	baz.Mint(lp01, 50000000)
-	baz.Mint(lp02, 50000000)
-	baz.Mint(lp03, 50000000)
-	baz.Mint(tr01, 50000000)
-
-	baz.Approve(lp01, poolAddr, 50000000)
-	// baz.Approve(lp02, poolAddr, 50000000)
-	// baz.Approve(lp03, poolAddr, 50000000)
-	baz.Approve(tr01, poolAddr, 50000000)
-
-	// baz.Approve(lp01, lp01, 50000000)
-	// baz.Approve(lp02, lp02, 50000000)
-	// baz.Approve(lp03, lp03, 50000000)
-	// baz.Approve(tr01, tr01, 50000000)
-
-	// baz.Approve(posAddr, poolAddr, 50000000)
+	baz.Mint(lp01, 50000000000)
+	baz.Mint(lp02, 50000000000)
+	baz.Mint(lp03, 50000000000)
+	baz.Mint(tr01, 50000000000)
+
+	baz.Approve(lp01, poolAddr, 50000000000)
+	baz.Approve(lp02, poolAddr, 50000000000)
+	baz.Approve(lp03, poolAddr, 50000000000)
+	baz.Approve(tr01, poolAddr, 50000000000)
+
+	baz.Approve(posAddr, poolAddr, 50000000000)
 }
 
 // method proxies as public functions.
@@ -121,7 +116,7 @@ func FaucetL() {
 	// FIXME: add payment in gnot?
 	// caller := std.GetOrigCaller()
 	caller := std.PrevRealm().Addr()
-	baz.Mint(caller, 50000000000) // 50_000_000_000
+	baz.Mint(caller, 50000000000000) // 50_000_000_000
 }
 
 // administration.

diff --git a/_setup/foo/foo.gno b/_setup/foo/foo.gno
@@ -32,22 +32,17 @@ func init() {
 		posAddr  = std.DerivePkgAddr("gno.land/r/position")
 	)
 
-	foo.Mint(lp01, 50000000)
-	foo.Mint(lp02, 50000000)
-	foo.Mint(lp03, 50000000)
-	foo.Mint(tr01, 50000000)
-
-	foo.Approve(lp01, poolAddr, 50000000)
-	// foo.Approve(lp02, poolAddr, 50000000)
-	// foo.Approve(lp03, poolAddr, 50000000)
-	foo.Approve(tr01, poolAddr, 50000000)
-
-	// foo.Approve(lp01, lp01, 50000000)
-	// foo.Approve(lp02, lp02, 50000000)
-	// foo.Approve(lp03, lp03, 50000000)
-	// foo.Approve(tr01, tr01, 50000000)
-
-	// foo.Approve(posAddr, poolAddr, 50000000)
+	foo.Mint(lp01, 50000000000)
+	foo.Mint(lp02, 50000000000)
+	foo.Mint(lp03, 50000000000)
+	foo.Mint(tr01, 50000000000)
+
+	foo.Approve(lp01, poolAddr, 50000000000)
+	foo.Approve(lp02, poolAddr, 50000000000)
+	foo.Approve(lp03, poolAddr, 50000000000)
+	foo.Approve(tr01, poolAddr, 50000000000)
+
+	// foo.Approve(posAddr, poolAddr, 50000000000)
 }
 
 // method proxies as public functions.

diff --git a/_setup/gnos/gno.mod b/_setup/gnos/gno.mod
diff --git a/_setup/gns/gno.mod b/_setup/gns/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/gns
diff --git a/_setup/gnos/gnos.gno → _setup/gns/gns.gno b/_setup/gnos/gnos.gno → _setup/gns/gns.gno
@@ -1,4 +1,4 @@
-package gnos
+package gns
 
 import (
 	"std"
@@ -10,21 +10,21 @@ import (
 )
 
 var (
-	gnos  *grc20.AdminToken
+	gns   *grc20.AdminToken
 	admin []string
 )
 
 func init() {
-	gnos = grc20.NewAdminToken("Gnoswap Shares", "GNOS", 4)
+	gns = grc20.NewAdminToken("Gnoswap Shares", "GNOS", 4)
 
 	// for swap > staker
 	var (
 		stakerAddr = std.Address("g13h5s9utqcwg3a655njen0p89txusjpfrs3vxp8")
 		poolAddr   = std.Address("g1ee305k8yk0pjz443xpwtqdyep522f9g5r7d63w")
 		ira        = std.Address("g1d9exzh6lta047h6lta047h6lta047h6l8ylkpa") // INTERNAL REWARD ACCOUNT
 	)
-	gnos.Mint(ira, 50000000000)                // 50_000_000_000
-	gnos.Approve(ira, stakerAddr, 50000000000) // owner, spender, amount
+	gns.Mint(ira, 50000000000)                // 50_000_000_000
+	gns.Approve(ira, stakerAddr, 50000000000) // owner, spender, amount
 
 	admin = append(admin, string(stakerAddr))
 }
@@ -34,23 +34,23 @@ func init() {
 
 // getters.
 func GetGRC20() *grc20.AdminToken {
-	return gnos
+	return gns
 }
 
 func TotalSupply() uint64 {
-	return gnos.TotalSupply()
+	return gns.TotalSupply()
 }
 
 func BalanceOf(owner users.AddressOrName) uint64 {
-	balance, err := gnos.BalanceOf(owner.Resolve())
+	balance, err := gns.BalanceOf(owner.Resolve())
 	if err != nil {
 		panic(err)
 	}
 	return balance
 }
 
 func Allowance(owner, spender users.AddressOrName) uint64 {
-	allowance, err := gnos.Allowance(owner.Resolve(), spender.Resolve())
+	allowance, err := gns.Allowance(owner.Resolve(), spender.Resolve())
 	if err != nil {
 		panic(err)
 	}
@@ -62,7 +62,7 @@ func Allowance(owner, spender users.AddressOrName) uint64 {
 func Transfer(to users.AddressOrName, amount uint64) {
 	// caller := std.GetOrigCaller()
 	caller := std.PrevRealm().Addr()
-	err := gnos.Transfer(caller, to.Resolve(), amount)
+	err := gns.Transfer(caller, to.Resolve(), amount)
 	if err != nil {
 		panic(err.Error())
 	}
@@ -71,7 +71,7 @@ func Transfer(to users.AddressOrName, amount uint64) {
 func Approve(spender users.AddressOrName, amount uint64) {
 	// caller := std.GetOrigCaller()
 	caller := std.PrevRealm().Addr()
-	err := gnos.Approve(caller, spender.Resolve(), amount)
+	err := gns.Approve(caller, spender.Resolve(), amount)
 	if err != nil {
 		panic(err.Error())
 	}
@@ -80,7 +80,7 @@ func Approve(spender users.AddressOrName, amount uint64) {
 func TransferFrom(from, to users.AddressOrName, amount uint64) {
 	// caller := std.GetOrigCaller()
 	caller := std.PrevRealm().Addr()
-	err := gnos.TransferFrom(caller, from.Resolve(), to.Resolve(), amount)
+	err := gns.TransferFrom(caller, from.Resolve(), to.Resolve(), amount)
 	if err != nil {
 		panic(err.Error())
 	}
@@ -93,15 +93,15 @@ func Faucet() {
 	// FIXME: add payment in gnot?
 	// caller := std.GetOrigCaller()
 	caller := std.PrevRealm().Addr()
-	gnos.Mint(caller, 1000*10000) // 1k
+	gns.Mint(caller, 1000*10000) // 1k
 }
 
 func FaucetL() {
 	// FIXME: add limits?
 	// FIXME: add payment in gnot?
 	// caller := std.GetOrigCaller()
 	caller := std.PrevRealm().Addr()
-	gnos.Mint(caller, 50000000000) // 50_000_000_000
+	gns.Mint(caller, 50000000000) // 50_000_000_000
 }
 
 // administration.
@@ -110,14 +110,14 @@ func Mint(address users.AddressOrName, amount uint64) {
 	// caller := std.GetOrigCaller()
 	caller := std.PrevRealm().Addr()
 	assertIsAdmin(caller)
-	gnos.Mint(address.Resolve(), amount)
+	gns.Mint(address.Resolve(), amount)
 }
 
 func Burn(address users.AddressOrName, amount uint64) {
 	// caller := std.GetOrigCaller()
 	caller := std.PrevRealm().Addr()
 	assertIsAdmin(caller)
-	gnos.Burn(address.Resolve(), amount)
+	gns.Burn(address.Resolve(), amount)
 }
 
 func AppendAdmin(address users.AddressOrName) {
@@ -148,10 +148,10 @@ func Render(path string) string {
 
 	switch {
 	case path == "":
-		return gnos.RenderHome()
+		return gns.RenderHome()
 	case c == 2 && parts[0] == "balance":
 		owner := users.AddressOrName(parts[1])
-		balance, _ := gnos.BalanceOf(owner.Resolve())
+		balance, _ := gns.BalanceOf(owner.Resolve())
 		return ufmt.Sprintf("%d\n", balance)
 	default:
 		return "404\n"

diff --git a/_setup/gnos/gnos_test.gno → _setup/gns/gns_test.gno b/_setup/gnos/gnos_test.gno → _setup/gns/gns_test.gno
@@ -1,4 +1,4 @@
-package gnos
+package gns
 
 import (
 	"std"

diff --git a/_setup/qux/gno.mod b/_setup/qux/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/qux