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

pool/pool.gno

@@ -611,6 +611,8 @@ func tickTransition(step StepComputations, zeroForOne bool, state SwapState, poo
 		newState.liquidity = liquidityMathAddDelta(state.liquidity, liquidityNet)
 	}
 
+	pool.tickCrossHook(GetPoolPath(pool.token0Path, pool.token1Path, pool.fee), step.tickNext, zeroForOne)
+
 	if zeroForOne {
 		newState.tick = step.tickNext - 1
 	} else {

pool/type.gno

@@ -258,6 +258,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 {

staker/calculate_pool_position_reward.gno

@@ -238,20 +238,10 @@ func CalcPoolPosition() {
 
 	// calculate each pool's total staked liquidity
 	poolTotalStakedLiquidity = make(map[string]*u256.Uint) // clear
-	for tokenId, deposit := range deposits {
-		poolPath := deposit.targetPoolPath
-		if _, exist := poolTotalStakedLiquidity[poolPath]; !exist {
-			poolTotalStakedLiquidity[poolPath] = u256.Zero()
-		}
-
-		isInRange := pn.PositionIsInRange(tokenId)
-		if isInRange == false {
-			continue
-		}
-
-		liqStr := pn.PositionGetPositionLiquidityStr(tokenId)
-		positionLiquidity := u256.MustFromDecimal(liqStr)
-		poolTotalStakedLiquidity[poolPath] = poolTotalStakedLiquidity[poolPath].Add(poolTotalStakedLiquidity[poolPath], positionLiquidity)
+	// FIXME: temporarily iterate all pools.
+	// after refactoring is complete, it will be removed
+	for poolPath, info := range stakerPoolInfo {
+		poolTotalStakedLiquidity[poolPath] = info.totalStakedLiquidityInRange
 	}
 
 	// calculate each position's liquidity ratio

staker/staker.gno

@@ -36,6 +36,8 @@ var (
 	/* common */
 	// deposits stores deposit information for each tokenId
 	deposits map[uint64]Deposit = make(map[uint64]Deposit)
+
+	// depositOperations map[uint64][]DepositOperation = make(map[uint64][]DepositOperation)
 )
 
 const (
@@ -135,6 +137,8 @@ func StakeToken(tokenId uint64) (string, string, string) {
 	// after transfer, set caller(user) as position operator (to collect fee and reward)
 	pn.SetPositionOperator(tokenId, caller)
 
+	modifyStakerPoolInfo(poolPath, tokenId, liquidity)
+
 	token0Amount, token1Amount := getTokenPairBalanceFromPosition(tokenId)
 
 	prevAddr, prevRealm := getPrev()
@@ -349,6 +353,8 @@ func UnstakeToken(tokenId uint64, unwrapResult bool) (string, string, string) {
 	poolPath := pn.PositionGetPositionPoolKey(tokenId)
 	token0Amount, token1Amount := getTokenPairBalanceFromPosition(tokenId)
 
+	modifyStakerPoolInfo(poolPath, tokenId, i256.Zero().Neg(liquidity))
+
 	prevAddr, prevRealm := getPrev()
 	std.Emit(
 		"UnstakeToken",
@@ -744,3 +750,78 @@ func getIncentives() map[string]ExternalIncentive {
 func getPoolIncentives() map[string][]string {
 	return poolIncentives
 }
+
+
+// TODO: separate into different file
+
+type StakerPoolInfo struct {
+	//totalStakedLiquidity *u256.Uint
+	totalStakedLiquidityInRange *u256.Uint
+}
+
+type StakerTickInfo struct {
+	liquidityInRangeDelta *u256.Uint
+}
+
+var (
+	stakerPoolInfo = make(map[string]StakerPoolInfo)
+	stakerTickInfo = make(map[int32]StakerTickInfo)
+)
+
+func modifyStakerPoolInfo(poolPath string, tokenId uint64, liquidity *u256.Uint) {
+	// update staker side pool info
+	pool, ok := stakerPoolInfo[poolPath]
+	if !ok {
+		pool = StakerPoolInfo{
+			totalStakedLiquidity: u256.Zero(),
+			totalStakedLiquidityInRange: u256.Zero(),
+		}
+	}
+	//pool.totalStakedLiquidity = liquidityMathAddDelta(pool.totalStakedLiquidity, liquidity)
+	if pn.PositionIsInRange(tokenId) {
+		pool.totalStakedLiquidityInRange = liquidityMathAddDelta(pool.totalStakedLiquidityInRange, liquidity)
+	}
+	stakerPoolInfo[poolPath] = pool
+
+	// update staker side tick info
+	lowerTick, ok := stakerTickInfo[pn.PositionGetPositionTickLower(tokenId)]
+	if !ok {
+		lowerTick = StakerTickInfo{
+			liquidityInRangeDelta: u256.Zero(),
+		}
+	}
+	lowerTick.liquidityInRangeDelta = liquidityMathAddDelta(lowerTick.liquidityInRangeDelta, liquidity)
+	stakerTickInfo[pn.PositionGetPositionTickLower(tokenId)] = lowerTick
+
+	upperTick, ok := stakerTickInfo[pn.PositionGetPositionTickUpper(tokenId)]
+	if !ok {
+		upperTick = StakerTickInfo{
+			liquidityInRangeDelta: u256.Zero(),
+		}
+	}
+	upperTick.liquidityInRangeDelta = liquidityMathAddDelta(upperTick.liquidityInRangeDelta, i256.Zero().Neg(liquidity))
+	stakerTickInfo[pn.PositionGetPositionTickUpper(tokenId)] = upperTick
+}
+
+func tickCrossHook(poolPath string, tickId int32, zeroForOne bool) {
+	tick, ok := stakerTickInfo[tickId]
+	if !ok {
+		return
+	}
+
+	pool, ok := stakerPoolInfo[poolPath]
+	if !ok {
+		panic(addDetailToError(
+			errDataNotFound,
+			ufmt.Sprintf("staker.gno__tickCrossHook() || poolPath(%s) not found", poolPath),
+		))
+	}
+
+	liquidityInRangeDelta := tick.liquidityInRangeDelta
+	if zeroForOne {
+		liquidityInRangeDelta = i256.Zero().Neg(liquidityInRangeDelta)
+	}
+	pool.totalStakedLiquidityInRange = liquidityMathAddDelta(pool.totalStakedLiquidityInRange, liquidityInRangeDelta)
+
+	stakerPoolInfo[poolPath] = pool
+}

staker/tier_ratio.gno

@@ -160,4 +160,4 @@ func calcAmount(avgBlockAmountX96 *u256.Uint, dur, pct uint64) (uint64, uint64)
 
 	durAmount := new(u256.Uint).Div(durAmountX96, _q96).Uint64()
 	return fullAmount, durAmount
-}
+}

staker/type.gno

@@ -31,3 +31,24 @@ type Deposit struct {
 	stakeHeight    int64       // staked block height
 	targetPoolPath string      // staked position's pool path
 }
+
+type DepositOperationType uint64
+
+const (
+	DEPOSIT_OPERATION_TYPE_STAKE     DepositOperationType = 1
+	DEPOSIT_OPERATION_TYPE_FILL_30   DepositOperationType = 2
+	DEPOSIT_OPERATION_TYPE_FILL_50   DepositOperationType = 3
+	DEPOSIT_OPERATION_TYPE_FILL_70   DepositOperationType = 4
+	DEPOSIT_OPERATION_TYPE_FILL_100  DepositOperationType = 5
+)
+
+type DepositOperation struct {
+	tokenId uint64 // token id
+	operationType DepositOperationType // operation type
+}
+
+type DepositPrediction struct {
+	totalAmount uint64 // total amount
+
+	operations []DepositOperation // operations
+}