refactor(staker): add in-range staked liquidity tracker

__local/grc20_tokens/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/register_gnodev/gno.mod

@@ -1,21 +1 @@
-module gno.land/r/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/v2/register_gnodev
-
-require (
-	gno.land/p/demo/users v0.0.0-latest
-	gno.land/r/demo/foo20 v0.0.0-latest
-	gno.land/r/demo/wugnot v0.0.0-latest
-	gno.land/r/gnoswap/v1/community_pool v0.0.0-latest
-	gno.land/r/gnoswap/v1/gns v0.0.0-latest
-	gno.land/r/gnoswap/v1/gov/staker v0.0.0-latest
-	gno.land/r/gnoswap/v1/launchpad v0.0.0-latest
-	gno.land/r/gnoswap/v1/pool v0.0.0-latest
-	gno.land/r/gnoswap/v1/protocol_fee v0.0.0-latest
-	gno.land/r/gnoswap/v1/router v0.0.0-latest
-	gno.land/r/gnoswap/v1/staker v0.0.0-latest
-	gno.land/r/onbloc/bar v0.0.0-latest
-	gno.land/r/onbloc/baz v0.0.0-latest
-	gno.land/r/onbloc/foo v0.0.0-latest
-	gno.land/r/onbloc/obl v0.0.0-latest
-	gno.land/r/onbloc/qux v0.0.0-latest
-	gno.land/r/onbloc/usdc v0.0.0-latest
-)
+module gno.land/r/g1er355fkjksqpdtwmhf5penwa82p0rhqxkkyhk5/v2/register_gnodev

__local/grc20_tokens/onbloc/bar/gno.mod

@@ -1,10 +1 @@
-module gno.land/r/onbloc/bar
-
-require (
-	gno.land/p/demo/grc/grc20 v0.0.0-latest
-	gno.land/p/demo/ownable v0.0.0-latest
-	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/demo/grc20reg v0.0.0-latest
-)
+module gno.land/r/onbloc/bar

__local/grc20_tokens/onbloc/baz/gno.mod

@@ -1,10 +1 @@
-module gno.land/r/onbloc/baz
-
-require (
-	gno.land/p/demo/grc/grc20 v0.0.0-latest
-	gno.land/p/demo/ownable v0.0.0-latest
-	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/demo/grc20reg v0.0.0-latest
-)
+module gno.land/r/onbloc/baz

__local/grc20_tokens/onbloc/foo/gno.mod

@@ -1,10 +1 @@
-module gno.land/r/onbloc/foo
-
-require (
-	gno.land/p/demo/grc/grc20 v0.0.0-latest
-	gno.land/p/demo/ownable v0.0.0-latest
-	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/demo/grc20reg v0.0.0-latest
-)
+module gno.land/r/onbloc/foo

__local/grc20_tokens/onbloc/obl/gno.mod

@@ -1,10 +1 @@
-module gno.land/r/onbloc/obl
-
-require (
-	gno.land/p/demo/grc/grc20 v0.0.0-latest
-	gno.land/p/demo/ownable v0.0.0-latest
-	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/demo/grc20reg v0.0.0-latest
-)
+module gno.land/r/onbloc/obl

__local/grc20_tokens/onbloc/qux/gno.mod

@@ -1,10 +1 @@
-module gno.land/r/onbloc/qux
-
-require (
-	gno.land/p/demo/grc/grc20 v0.0.0-latest
-	gno.land/p/demo/ownable v0.0.0-latest
-	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/demo/grc20reg v0.0.0-latest
-)
+module gno.land/r/onbloc/qux

__local/grc20_tokens/onbloc/usdc/gno.mod

@@ -1,10 +1 @@
-module gno.land/r/onbloc/usdc
-
-require (
-	gno.land/p/demo/grc/grc20 v0.0.0-latest
-	gno.land/p/demo/ownable v0.0.0-latest
-	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/demo/grc20reg v0.0.0-latest
-)
+module gno.land/r/onbloc/usdc

_deploy/r/gnoswap/common/address_and_username.gno

@@ -10,7 +10,7 @@ import (
 // AddrToUser converts a type from address to AddressOrName.
 // It panics if the address is invalid.
 func AddrToUser(addr std.Address) pusers.AddressOrName {
-	assertValidAddr(addr)
+	AssertValidAddr(addr)
 	return pusers.AddressOrName(addr)
 }
 
@@ -20,9 +20,9 @@ func UserToAddr(user pusers.AddressOrName) std.Address {
 	return users.Resolve(user)
 }
 
-// assertValidAddr checks if the given address is valid.
+// AssertValidAddr checks if the given address is valid.
 // It panics with a detailed error message if the address is invalid.
-func assertValidAddr(addr std.Address) {
+func AssertValidAddr(addr std.Address) {
 	if !addr.IsValid() {
 		panic(newErrorWithDetail(errInvalidAddr, addr.String()))
 	}

_deploy/r/gnoswap/common/address_and_username_test.gno

@@ -103,11 +103,11 @@ func TestAssertValidAddr(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			if tt.shouldPanic {
 				uassert.PanicsWithMessage(t, tt.panicMsg, func() {
-					assertValidAddr(tt.addr)
+					AssertValidAddr(tt.addr)
 				})
 			} else {
 				uassert.NotPanics(t, func() {
-					assertValidAddr(tt.addr)
+					AssertValidAddr(tt.addr)
 				})
 			}
 		})

_deploy/r/gnoswap/common/strings.gno

@@ -1,6 +1,7 @@
 package common
 
 import (
+	"strconv"
 	"strings"
 
 	"gno.land/p/demo/ufmt"
@@ -14,3 +15,45 @@ func Split(input string, sep string, length int) ([]string, error) {
 
 	return result, nil
 }
+
+// EncodeUint converts an uint64 number into a zero-padded 20-character string.
+//
+// Parameters:
+// - num (uint64): The number to encode.
+//
+// Returns:
+// - string: A zero-padded string representation of the number.
+//
+// Example:
+// Input: 12345
+// Output: "00000000000000012345"
+func EncodeUint(num uint64) string {
+	// Convert the value to a decimal string.
+	s := strconv.FormatUint(num, 10)
+
+	// Zero-pad to a total length of 20 characters.
+	zerosNeeded := 20 - len(s)
+	return strings.Repeat("0", zerosNeeded) + s
+}
+
+// DecodeUint converts a zero-padded string back into a uint64 number.
+//
+// Parameters:
+// - s (string): The zero-padded string.
+//
+// Returns:
+// - uint64: The decoded number.
+//
+// Panics:
+// - If the string cannot be parsed into a uint64.
+//
+// Example:
+// Input: "00000000000000012345"
+// Output: 12345
+func DecodeUint(s string) uint64 {
+	num, err := strconv.ParseUint(s, 10, 64)
+	if err != nil {
+		panic(err)
+	}
+	return num
+}

_deploy/r/gnoswap/gnft/gnft.gno

@@ -93,6 +93,24 @@ func OwnerOf(tid grc721.TokenID) (std.Address, error) {
 	return ownerAddr, nil
 }
 
+// MustOwnerOf returns the current owner's address of a specific token ID
+// Parameters:
+//   - tid: The token ID to check ownership of
+//
+// Returns:
+//   - std.Address: The address of the token owner
+//
+// Panics:
+//   - If the token ID is invalid
+func MustOwnerOf(tid grc721.TokenID) std.Address {
+	ownerAddr, err := OwnerOf(tid)
+	if err != nil {
+		panic(err.Error())
+	}
+
+	return ownerAddr
+}
+
 // SetTokenURI sets the metadata URI using a randomly generated SVG image
 // Parameters:
 //   - tid (grc721.TokenID): The token ID for which the URI will be updated.

_deploy/r/gnoswap/gns/_helper_test.gno

@@ -38,6 +38,6 @@ func resetHalvingRelatedObject(t *testing.T) {
 	startHeight = std.GetHeight()
 	startTimestamp = time.Now().Unix()
 
-	initializeHalvingData()
+	emissionState = GetEmissionState()
 	setEndTimestamp(startTimestamp + consts.TIMESTAMP_YEAR*HALVING_END_YEAR)
 }

_deploy/r/gnoswap/gns/errors.gno

@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	errNoPermission    = errors.New("[GNOSWAP-GNS-001] caller has no permission")
+	errInvalidYear     = errors.New("[GNOSWAP-GNS-001] invalid year")
 	errTooManyEmission = errors.New("[GNOSWAP-GNS-002] too many emission reward")
 )