remove: reward_calculation from /launchpadr

Author: notJoon

Diff for: contract/p/gnoswap/launchpad/reward_calculation.gno

@@ -73,6 +73,7 @@ type RewardState struct {
 // Getters for RewardState
 func (rs *RewardState) PriceAccumulation() *u256.Uint { return rs.priceAccumulation }
 func (rs *RewardState) TotalStake() uint64            { return rs.totalStake }
+func (rs *RewardState) SetTotalStake(amount uint64)    { rs.totalStake = amount }
 func (rs *RewardState) LastHeight() uint64            { return rs.lastHeight }
 func (rs *RewardState) RewardPerBlock() *u256.Uint    { return rs.rewardPerBlock }
 func (rs *RewardState) EndHeight() uint64             { return rs.endHeight }

Diff for: contract/r/gnoswap/launchpad/_helper_test.gno

@@ -13,6 +13,13 @@ var (
 	adminAddr  = consts.ADMIN
 	adminUser  = adminAddr
 	adminRealm = std.NewUserRealm(adminAddr)
+
+	fooPath string = "gno.land/r/onbloc/foo"
+	barPath string = "gno.land/r/onbloc/bar"
+	bazPath string = "gno.land/r/onbloc/baz"
+	quxPath string = "gno.land/r/onbloc/qux"
+
+	oblPath string = "gno.land/r/onbloc/obl"
 )
 
 // MockXGNSToken implements basic functionality for testing xgns token

Diff for: contract/r/gnoswap/launchpad/api_deposit.gno

@@ -31,7 +31,10 @@ func ApiGetClaimableDepositByAddress(address std.Address) uint64 {
 		}
 
 		rwd, _ := rewardStates.Get(deposit.projectId, deposit.tier)
-		reward := rwd.Claim(depositId, uint64(std.GetHeight()))
+		reward, err := rwd.Claim(depositId, uint64(std.GetHeight()))
+		if err != nil {
+			panic(err.Error())
+		}
 
 		gnsToUser += reward
 	}

Diff for: contract/r/gnoswap/launchpad/api_reward.gno

@@ -36,7 +36,12 @@ func ApiGetDepositRewardByDepositId(depositId string) uint64 {
 		return 0
 	}
 
-	return rewardState.CalculateReward(depositId)
+	res, err := rewardState.CalculateReward(depositId)
+	if err != nil {
+		return 0
+	}
+
+	return res
 }
 
 func ApiGetDepositRewardByAddress(address std.Address) uint64 {
@@ -59,7 +64,11 @@ func ApiGetDepositRewardByAddress(address std.Address) uint64 {
 		if err != nil {
 			continue
 		}
-		totalReward += rewardState.CalculateReward(depositId)
+		reward, err := rewardState.CalculateReward(depositId)
+		if err != nil {
+			continue
+		}
+		totalReward += reward
 	}
 
 	return totalReward

Diff for: contract/r/gnoswap/launchpad/deposit.gno

@@ -13,6 +13,7 @@ import (
 	"gno.land/r/gnoswap/v1/gns"
 	gs "gno.land/r/gnoswap/v1/gov/staker"
 	"gno.land/r/gnoswap/v1/gov/xgns"
+	ppad "gno.land/p/gnoswap/v1/launchpad"
 )
 
 var (
@@ -153,7 +154,7 @@ func DepositGns(targetProjectTierId string, amount uint64) string {
 			"tierAmountPerBlockX128", tier.TierAmountPerBlockX128().ToString(),
 		)
 
-		rewardState := NewRewardState(tier.tierAmountPerBlockX128, tier.started.height, tier.ended.height)
+		rewardState := ppad.NewRewardState(tier.tierAmountPerBlockX128, tier.started.height, tier.ended.height)
 		rewardStates.Set(info.Project.id, info.TierType, rewardState)
 	}
 

Diff for: contract/r/gnoswap/launchpad/launchpad.gno

@@ -13,7 +13,8 @@ import (
 	"gno.land/p/gnoswap/consts"
 	"gno.land/r/gnoswap/v1/common"
 	en "gno.land/r/gnoswap/v1/emission"
-	"gno.land/r/gnoswap/v1/gns"
+
+	ppad "gno.land/p/gnoswap/v1/launchpad"
 )
 
 var (
@@ -717,7 +718,7 @@ func createTier(
 		reward:                 *reward,
 	}
 
-	rewardState := NewRewardState(tier.tierAmountPerBlockX128, startHeight, endHeight)
+	rewardState := ppad.NewRewardState(tier.tierAmountPerBlockX128, startHeight, endHeight)
 	rewardStates.Set(projectId, strconv.FormatUint(duration, 10), rewardState)
 
 	projectTiersWithoutDeposit[tierId] = true

Diff for: contract/r/gnoswap/launchpad/reward_calculation.gno

@@ -2,247 +2,7 @@
 package launchpad
 
 import (
-	"gno.land/p/demo/avl"
-	"gno.land/p/demo/ufmt"
-	u256 "gno.land/p/gnoswap/uint256"
+	ppad "gno.land/p/gnoswap/v1/launchpad"
 )
 
-type StakerRewardInfo struct {
-	StartHeight uint64     // height when launchpad started staking
-	PriceDebt   *u256.Uint // price debt per GNS stake, Q128
-	Amount      uint64     // amount of GNS staked
-	Claimed     uint64     // amount of reward claimed so far
-}
-
-func (self *StakerRewardInfo) Debug() string {
-	return ufmt.Sprintf("{ StartHeight: %d, PriceDebt: %d, Amount: %d, Claimed: %d }", self.StartHeight, self.PriceDebtUint64(), self.Amount, self.Claimed)
-}
-
-func (self *StakerRewardInfo) PriceDebtUint64() uint64 {
-	return u256.Zero().Rsh(self.PriceDebt, 128).Uint64()
-}
-
-type RewardState struct {
-	PriceAccumulation *u256.Uint // claimable Launchpad reward per xGNS stake, Q128
-	TotalStake        uint64     // total xGNS staked
-
-	LastHeight     uint64     // last height when reward was calculated
-	RewardPerBlock *u256.Uint // reward per block, = Tier.tierAmountPerBlockX128
-	EndHeight      uint64
-
-	TotalEmptyBlock uint64
-
-	info *avl.Tree // depositId -> StakerRewardInfo
-}
-
-func NewRewardState(rewardPerBlock *u256.Uint, startHeight uint64, endHeight uint64) *RewardState {
-	return &RewardState{
-		PriceAccumulation: u256.Zero(),
-		TotalStake:        0,
-		LastHeight:        startHeight,
-		RewardPerBlock:    rewardPerBlock,
-		EndHeight:         endHeight,
-		info:              avl.NewTree(),
-	}
-}
-
-func (self *RewardState) PriceAccumulationUint64() uint64 {
-	return u256.Zero().Rsh(self.PriceAccumulation, 128).Uint64()
-}
-
-func (self *RewardState) RewardPerBlockUint64() uint64 {
-	return u256.Zero().Rsh(self.RewardPerBlock, 128).Uint64()
-}
-
-func (self *RewardState) Debug() string {
-	return ufmt.Sprintf("{ PriceAccumulation: %d, TotalStake: %d, LastHeight: %d, RewardPerBlock: %d, EndHeight: %d, info: len(%d) }", self.PriceAccumulationUint64(), self.TotalStake, self.LastHeight, self.RewardPerBlockUint64(), self.EndHeight, self.info.Size())
-}
-
-type RewardStates struct {
-	states *avl.Tree // projectId:tier string -> RewardState
-}
-
-var rewardStates = RewardStates{
-	states: avl.NewTree(),
-}
-
-func (states RewardStates) Get(projectId string, tierStr string) (*RewardState, error) {
-	key := projectId + ":" + tierStr
-	statesI, exists := states.states.Get(key)
-	if !exists {
-		return nil, ufmt.Errorf("reward state not found for projectId %s and tierStr %s", projectId, tierStr)
-	}
-	return statesI.(*RewardState), nil
-}
-
-func (states RewardStates) Set(projectId string, tierStr string, state *RewardState) {
-	key := projectId + ":" + tierStr
-	states.states.Set(key, state)
-}
-
-func (states RewardStates) DeleteProject(projectId string) uint64 {
-	totalLeftover := uint64(0)
-	keys := []string{}
-	states.states.Iterate(projectId+":", projectId+";", func(key string, value interface{}) bool {
-		state := value.(*RewardState)
-		totalEmptyBlock := state.TotalEmptyBlock
-		if state.TotalStake == 0 {
-			totalEmptyBlock += state.EndHeight - state.LastHeight
-		}
-		totalEmptyBlockU256 := u256.NewUint(totalEmptyBlock)
-		totalEmptyRewards := u256.Zero().Mul(totalEmptyBlockU256, state.RewardPerBlock)
-		totalLeftover += totalEmptyRewards.Uint64()
-		keys = append(keys, key)
-		return false
-	})
-
-	for _, key := range keys {
-		states.states.Remove(key)
-	}
-
-	return totalLeftover
-}
-
-func (self *RewardState) Info(depositId string) StakerRewardInfo {
-	infoI, exists := self.info.Get(depositId)
-	if !exists {
-		panic(addDetailToError(
-			errNotExistDeposit, ufmt.Sprintf("(%s)", depositId)))
-	}
-	return infoI.(StakerRewardInfo)
-}
-
-func (self *RewardState) CalculateReward(depositId string) uint64 {
-	info := self.Info(depositId)
-	stakerPrice := u256.Zero().Sub(self.PriceAccumulation, info.PriceDebt)
-	reward := stakerPrice.Mul(stakerPrice, u256.NewUint(info.Amount))
-	reward = reward.Rsh(reward, 128)
-	return reward.Uint64() - info.Claimed
-}
-
-// amount MUST be less than or equal to the amount of xGNS staked
-// This function does not check it
-func (self *RewardState) deductReward(depositId string, currentHeight uint64) uint64 {
-	if currentHeight < self.LastHeight {
-		panic(addDetailToError(
-			errInvalidRewardState,
-			ufmt.Sprintf("currentHeight %d is less than LastHeight %d", currentHeight, self.LastHeight)))
-	}
-
-	deposit := deposits[depositId]
-	if deposit.claimableHeight > currentHeight {
-		panic(addDetailToError(
-			errInvalidRewardState,
-			ufmt.Sprintf("currentHeight %d is less than claimableHeight %d", currentHeight, deposit.claimableHeight)))
-	}
-
-	info := self.Info(depositId)
-	if info.StartHeight > currentHeight {
-		panic(addDetailToError(
-			errInvalidRewardState,
-			ufmt.Sprintf("currentHeight %d is less than StartHeight %d", currentHeight, info.StartHeight)))
-	}
-	reward64 := self.CalculateReward(depositId)
-
-	if reward64 == 0 {
-		return 0
-	}
-
-	info.Claimed += reward64
-	self.info.Set(depositId, info)
-
-	return reward64
-}
-
-// This function MUST be called as a part of AddStake or RemoveStake
-// CurrentBalance / StakeChange / IsRemoveStake will be updated in those functions
-func (self *RewardState) finalize(currentHeight uint64) {
-	if currentHeight <= self.LastHeight {
-		// Not started yet
-		return
-	}
-	if self.LastHeight >= self.EndHeight {
-		// already ended
-		return
-	}
-	if currentHeight > self.EndHeight {
-		currentHeight = self.EndHeight
-	}
-
-	diff := currentHeight - self.LastHeight
-	delta := u256.NewUint(diff)
-	delta = delta.Mul(delta, self.RewardPerBlock)
-
-	if self.TotalStake == uint64(0) {
-		self.TotalEmptyBlock += diff
-		self.LastHeight = currentHeight
-		return
-	}
-
-	price := delta.Div(delta, u256.NewUint(self.TotalStake))
-	self.PriceAccumulation = u256.Zero().Add(self.PriceAccumulation, price)
-	self.LastHeight = currentHeight
-}
-
-func (self *RewardState) AddStake(currentHeight uint64, depositId string, amount uint64) {
-	if self.info.Has(depositId) {
-		panic(addDetailToError(
-			errAlreadyExistDeposit,
-			ufmt.Sprintf("depositId %s already exists", depositId)))
-	}
-
-	self.finalize(currentHeight)
-
-	self.TotalStake += amount
-
-	if self.info.Has(depositId) {
-		info := self.Info(depositId)
-		info.PriceDebt.Add(info.PriceDebt, u256.NewUint(info.Amount))
-		info.PriceDebt.Add(info.PriceDebt, u256.Zero().Mul(self.PriceAccumulation, u256.NewUint(amount)))
-		info.PriceDebt.Div(info.PriceDebt, u256.NewUint(self.TotalStake))
-		info.Amount += amount
-		self.info.Set(depositId, info)
-		return
-	}
-
-	info := StakerRewardInfo{
-		StartHeight: currentHeight,
-		PriceDebt:   self.PriceAccumulation.Clone(),
-		Amount:      amount,
-		Claimed:     0,
-	}
-
-	self.info.Set(depositId, info)
-}
-
-func (self *RewardState) Claim(depositId string, currentHeight uint64) uint64 {
-	if !self.info.Has(depositId) {
-		panic(addDetailToError(
-			errNotExistDeposit,
-			ufmt.Sprintf("depositId %s", depositId)))
-	}
-
-	self.finalize(currentHeight)
-
-	reward := self.deductReward(depositId, currentHeight)
-
-	return reward
-}
-
-func (self *RewardState) RemoveStake(depositId string, amount uint64, currentHeight uint64) uint64 {
-	if !self.info.Has(depositId) {
-		panic(addDetailToError(
-			errNotExistDeposit,
-			ufmt.Sprintf("depositId %s", depositId)))
-	}
-
-	self.finalize(currentHeight)
-
-	reward := self.deductReward(depositId, currentHeight)
-
-	self.info.Remove(depositId)
-
-	self.TotalStake -= amount
-
-	return reward
-}
+var rewardStates = ppad.NewRewardStates()