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/gnft/gno.mod

@@ -1,9 +1 @@
-module gno.land/r/gnoswap/v1/gnft
-
-require (
-	gno.land/p/demo/grc/grc721 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/gnoswap/v1/common v0.0.0-latest
-)
+module gno.land/r/gnoswap/v1/gnft

_deploy/r/gnoswap/gns/gno.mod

@@ -1,13 +1 @@
-module gno.land/r/gnoswap/v1/gns
-
-require (
-	gno.land/p/demo/grc/grc20 v0.0.0-latest
-	gno.land/p/demo/json 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
-	gno.land/r/gnoswap/v1/common v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts v0.0.0-latest
-)
+module gno.land/r/gnoswap/v1/gns

_deploy/r/gnoswap/gns/gns.gno

@@ -141,6 +141,11 @@ func Mint(address pusers.AddressOrName) uint64 {
 			halvingYearMintAmount[year] += amount
 			amountToMint += amount
 		}
+		for i := fromYear; i < toYear; i++ {
+			amount := GetAmountByYear(i+1)
+			halvingHeight := halvingYearBlock[i]
+			addPerBlockMintUpdate(uint64(halvingHeight), amount)
+		}
 	}
 
 	err := privateLedger.Mint(users.Resolve(address), amountToMint)
@@ -165,6 +170,8 @@ func checkAndHandleIfLastBlockOfHalvingYear(height int64, amount uint64) uint64
 	if height == lastBlock {
 		leftForThisYear := halvingYearAmount[year] - halvingYearMintAmount[year]
 		amount = leftForThisYear
+		addPerBlockMintUpdate(uint64(height), amount)
+		addPerBlockMintUpdate(uint64(height+1), amountPerBlockPerHalvingYear[year+1])
 		return amount
 	}
 

_deploy/r/gnoswap/gns/halving.gno

@@ -4,6 +4,8 @@ import (
 	"std"
 	"time"
 
+	"gno.land/p/demo/avl"
+
 	"gno.land/p/demo/ufmt"
 
 	"gno.land/r/gnoswap/v1/common"
@@ -35,6 +37,38 @@ var (
 	startTimestamp int64
 )
 
+var perBlockMint *avl.Tree // height => uint64
+
+// endHeight MUST be equal or before the current height(must not be future)
+// setAvgBlockTimeInMsByAdmin does not change past emissions, safe
+func LastPerBlockMintUpdate(endHeight uint64) (uint64, uint64) {
+	height := uint64(0)
+	amount := uint64(0)
+	perBlockMint.ReverseIterate("", EncodeUint(endHeight), func(key string, value interface{}) bool {
+		height = DecodeUint(key)
+		amount = value.(uint64)
+		return false
+	})
+
+	return height, amount
+}
+
+func PerBlockMintUpdates(startHeight, endHeight uint64) ([]uint64, []uint64) {
+	heights := make([]uint64, 0)
+	updates := make([]uint64, 0)
+	perBlockMint.Iterate(EncodeUint(startHeight), EncodeUint(endHeight), func(key string, value interface{}) bool {
+		heights = append(heights, DecodeUint(key))
+		updates = append(updates, value.(uint64))
+		return false
+	})
+
+	return heights, updates
+}
+
+func addPerBlockMintUpdate(height uint64, amount uint64) {
+	perBlockMint.Set(EncodeUint(height), amount)
+}
+
 var halvingYearBlock = make(map[int64]int64)     // year => block
 var halvingYearTimestamp = make(map[int64]int64) // year => timestamp
 
@@ -91,6 +125,8 @@ func init() {
 
 		amountPerBlockPerHalvingYear[i] = uint64(amountPerBlock)
 	}
+
+	addPerBlockMintUpdate(uint64(height), amountPerBlockPerHalvingYear[1])
 }
 
 func GetAvgBlockTimeInMs() int64 {
@@ -161,6 +197,7 @@ func setAvgBlockTimeInMs(ms int64) {
 
 	// update it
 	amountPerBlockPerHalvingYear[year] = adjustedAmountPerBlock
+	addPerBlockMintUpdate(uint64(height), adjustedAmountPerBlock)
 
 	// adjust halving block
 	for keyYear, _ := range halvingYearBlock {

_deploy/r/gnoswap/gns/utils.gno

@@ -1,10 +1,29 @@
 package gns
 
 import (
+	"strconv"
+	"strings"
 	"std"
 )
 
 func getPrev() (string, string) {
 	prev := std.PrevRealm()
 	return prev.Addr().String(), prev.PkgPath()
 }
+
+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
+}
+
+func DecodeUint(s string) uint64 {
+	num, err := strconv.ParseUint(s, 10, 64)
+	if err != nil {
+		panic(err)
+	}
+	return num
+}

community_pool/gno.mod

@@ -1,8 +1 @@
-module gno.land/r/gnoswap/v1/community_pool
-
-require (
-	gno.land/p/demo/ufmt v0.0.0-latest
-	gno.land/p/demo/users v0.0.0-latest
-	gno.land/r/gnoswap/v1/common v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts v0.0.0-latest
-)
+module gno.land/r/gnoswap/v1/community_pool

emission/gno.mod

@@ -1,9 +1 @@
-module gno.land/r/gnoswap/v1/emission
-
-require (
-	gno.land/p/demo/ufmt v0.0.0-latest
-	gno.land/p/demo/users v0.0.0-latest
-	gno.land/r/gnoswap/v1/common v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts v0.0.0-latest
-	gno.land/r/gnoswap/v1/gns v0.0.0-latest
-)
+module gno.land/r/gnoswap/v1/emission

gov/governance/gno.mod

@@ -1,19 +1 @@
-module gno.land/r/gnoswap/v1/gov/governance
-
-require (
-	gno.land/p/demo/json v0.0.0-latest
-	gno.land/p/demo/ufmt v0.0.0-latest
-	gno.land/p/demo/users v0.0.0-latest
-	gno.land/p/gnoswap/uint256 v0.0.0-latest
-	gno.land/r/gnoswap/v1/common v0.0.0-latest
-	gno.land/r/gnoswap/v1/community_pool v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts v0.0.0-latest
-	gno.land/r/gnoswap/v1/emission 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/gov/xgns 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
-)
+module gno.land/r/gnoswap/v1/gov/governance

gov/staker/gno.mod

@@ -1,13 +1 @@
-module gno.land/r/gnoswap/v1/gov/staker
-
-require (
-	gno.land/p/demo/json v0.0.0-latest
-	gno.land/p/demo/ufmt v0.0.0-latest
-	gno.land/p/demo/users v0.0.0-latest
-	gno.land/p/gnoswap/uint256 v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts v0.0.0-latest
-	gno.land/r/gnoswap/v1/emission v0.0.0-latest
-	gno.land/r/gnoswap/v1/gns v0.0.0-latest
-	gno.land/r/gnoswap/v1/gov/xgns v0.0.0-latest
-	gno.land/r/gnoswap/v1/protocol_fee v0.0.0-latest
-)
+module gno.land/r/gnoswap/v1/gov/staker

gov/xgns/gno.mod

@@ -1,11 +1 @@
-module gno.land/r/gnoswap/v1/gov/xgns
-
-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/gnoswap/v1/common v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts v0.0.0-latest
-)
+module gno.land/r/gnoswap/v1/gov/xgns

launchpad/gno.mod

@@ -1,12 +1 @@
-module gno.land/r/gnoswap/v1/launchpad
-
-require (
-	gno.land/p/demo/json v0.0.0-latest
-	gno.land/p/demo/ufmt v0.0.0-latest
-	gno.land/p/demo/users v0.0.0-latest
-	gno.land/p/gnoswap/uint256 v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts 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/gov/xgns v0.0.0-latest
-)
+module gno.land/r/gnoswap/v1/launchpad

pool/type.gno

@@ -348,6 +348,8 @@ type Pool struct {
 	tickBitmaps TickBitmaps // maps tick index to tick bitmap
 
 	positions Positions // maps the key (caller, lower tick, upper tick) to a unique position
+
+	tickCrossHook func(poolPath string, tickId int32, zeroForOne bool)
 }
 
 func newPool(poolInfo *createPoolParams) *Pool {

protocol_fee/gno.mod

@@ -1,8 +1 @@
-module gno.land/r/gnoswap/v1/protocol_fee
-
-require (
-	gno.land/p/demo/ufmt v0.0.0-latest
-	gno.land/p/demo/users v0.0.0-latest
-	gno.land/r/gnoswap/v1/common v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts v0.0.0-latest
-)
+module gno.land/r/gnoswap/v1/protocol_fee

router/gno.mod

@@ -1,14 +1 @@
-module gno.land/r/gnoswap/v1/router
-
-require (
-	gno.land/p/demo/ufmt v0.0.0-latest
-	gno.land/p/demo/users v0.0.0-latest
-	gno.land/p/gnoswap/int256 v0.0.0-latest
-	gno.land/p/gnoswap/uint256 v0.0.0-latest
-	gno.land/r/demo/wugnot v0.0.0-latest
-	gno.land/r/gnoswap/v1/common v0.0.0-latest
-	gno.land/r/gnoswap/v1/consts v0.0.0-latest
-	gno.land/r/gnoswap/v1/emission v0.0.0-latest
-	gno.land/r/gnoswap/v1/pool v0.0.0-latest
-	gno.land/r/gnoswap/v1/staker v0.0.0-latest
-)
+module gno.land/r/gnoswap/v1/router