Update performance tracker and rewards

components/restapi/core/accounts.go

@@ -17,12 +17,6 @@ import (
 	"github.com/iotaledger/iota.go/v4/nodeclient/apimodels"
 )
 
-const (
-	DefaultPageSize                = 50
-	RequestsMemoryCacheGranularity = 10
-	MaxRequestedSlotAge            = 10
-)
-
 func congestionForAccountID(c echo.Context) (*apimodels.CongestionResponse, error) {
 	accountID, err := httpserver.ParseAccountIDParam(c, restapipkg.ParameterAccountID)
 	if err != nil {
@@ -79,13 +73,13 @@ func validators(c echo.Context) (*apimodels.ValidatorsResponse, error) {
 	}
 
 	// do not respond to really old requests
-	if requestedSlotIndex+MaxRequestedSlotAge < latestCommittedSlot {
+	if requestedSlotIndex+iotago.SlotIndex(restapi.ParamsRestAPI.MaxRequestedSlotAge) < latestCommittedSlot {
 		return nil, ierrors.Errorf("request is too old, request started at %d, latest committed slot index is %d", requestedSlotIndex, latestCommittedSlot)
 	}
 
 	nextEpoch := deps.Protocol.APIForSlot(latestCommittedSlot).TimeProvider().EpochFromSlot(latestCommittedSlot) + 1
 
-	slotRange := uint32(requestedSlotIndex / RequestsMemoryCacheGranularity)
+	slotRange := uint32(requestedSlotIndex) / restapi.ParamsRestAPI.RequestsMemoryCacheGranularity
 	registeredValidators, exists := deps.Protocol.MainEngineInstance().Retainer.RegisteredValidatorsCache(slotRange)
 	if !exists {
 		registeredValidators, err = deps.Protocol.MainEngineInstance().SybilProtection.OrderedRegisteredCandidateValidatorsList(nextEpoch)
@@ -175,11 +169,17 @@ func rewardsByOutputID(c echo.Context) (*apimodels.ManaRewardsResponse, error) {
 	case iotago.OutputDelegation:
 		//nolint:forcetypeassert
 		delegationOutput := utxoOutput.Output().(*iotago.DelegationOutput)
+		latestCommittedSlot := deps.Protocol.MainEngineInstance().SyncManager.LatestCommitment().Index()
+		stakingEnd := delegationOutput.EndEpoch
+		// the output is in delayed calaiming state if endEpoch is set, otherwise we use latest possible epoch
+		if delegationOutput.EndEpoch == 0 {
+			stakingEnd = deps.Protocol.APIForSlot(latestCommittedSlot).TimeProvider().EpochFromSlot(deps.Protocol.MainEngineInstance().SyncManager.LatestCommitment().Index())
+		}
 		reward, actualStart, actualEnd, err = deps.Protocol.MainEngineInstance().SybilProtection.DelegatorReward(
 			delegationOutput.ValidatorID,
 			delegationOutput.DelegatedAmount,
 			delegationOutput.StartEpoch,
-			delegationOutput.EndEpoch,
+			stakingEnd,
 		)
 	}
 	if err != nil {

components/restapi/params.go

@@ -20,6 +20,10 @@ type ParametersRestAPI struct {
 	AllowIncompleteBlock bool `default:"false" usage:"whether the node allows to fill in incomplete block and issue it for user"`
 	// MaxPageSize defines the maximum number of results per page.
 	MaxPageSize uint32 `default:"100" usage:"the maximum number of results per page"`
+	// RequestsMemoryCacheGranularity defines per how many slots a cache is created for big API requests.
+	RequestsMemoryCacheGranularity uint32 `default:"10" usage:"defines per how many slots a cache is created for big API requests"`
+	// MaxRequestedSlotAge defines the maximum age of a request that will be processed.
+	MaxRequestedSlotAge uint32 `default:"10" usage:"the maximum age of a request that will be processed"`
 
 	JWTAuth struct {
 		// salt used inside the JWT tokens for the REST API. Change this to a different value to invalidate JWT tokens not matching this new value

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/iotaledger/hive.go/stringify v0.0.0-20230906114834-b50190b9f9c2
 	github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14
 	github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b
-	github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1
+	github.com/iotaledger/iota.go/v4 v4.0.0-20230906132907-497a10a16173
 	github.com/labstack/echo/v4 v4.11.1
 	github.com/labstack/gommon v0.4.0
 	github.com/libp2p/go-libp2p v0.30.0

go.sum

@@ -307,8 +307,8 @@ github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14 h1:BkDuQ
 github.com/iotaledger/inx-app v1.0.0-rc.3.0.20230829161228-3f4eb50a4d14/go.mod h1:ADBXzdHXTldP0NB2Vf+KbhDxkYciGRjzQVXT6Rdne1g=
 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b h1:EPB/+iWeSx/WgJlzaXl8yjinxuD8CCOdi2ZPMLeeMVY=
 github.com/iotaledger/inx/go v1.0.0-rc.2.0.20230829160617-69b96c7c9f9b/go.mod h1:B7gyJP6GshCSlEmY3CxEk5TZdsMs3UNz5U92hkFDdMs=
-github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1 h1:10hGLm62uQ2V2HgqCR6FV0fvgpXo5GqlL/SIJ/t4VmY=
-github.com/iotaledger/iota.go/v4 v4.0.0-20230829160021-46cad51e89d1/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0=
+github.com/iotaledger/iota.go/v4 v4.0.0-20230906132907-497a10a16173 h1:1ICedDuNyfMHutCZ2iwdzRb1fbBa+8nx8El2NmIZzvE=
+github.com/iotaledger/iota.go/v4 v4.0.0-20230906132907-497a10a16173/go.mod h1:MM3RLtTEsfT6Wh0EhpgmzVO/HM0/NOw+E7+mnGTnyA0=
 github.com/ipfs/boxo v0.10.0 h1:tdDAxq8jrsbRkYoF+5Rcqyeb91hgWe2hp7iLu7ORZLY=
 github.com/ipfs/boxo v0.10.0/go.mod h1:Fg+BnfxZ0RPzR0nOodzdIq3A7KgoWAOWsEIImrIQdBM=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=

pkg/model/validator_performance.go

@@ -0,0 +1,37 @@
+package model
+
+import (
+	iotago "github.com/iotaledger/iota.go/v4"
+)
+
+type ValidatorPerformance struct {
+	// works if ValidatorBlocksPerSlot is less than 32 because we use it as bit vector
+	SlotActivityVector uint32 `serix:"0"`
+	// can be uint8 because max count per slot is maximally ValidatorBlocksPerSlot + 1
+	BlockIssuedCount               uint8          `serix:"1"`
+	HighestSupportedVersionAndHash VersionAndHash `serix:"2"`
+}
+
+func NewValidatorPerformance() *ValidatorPerformance {
+	return &ValidatorPerformance{
+		SlotActivityVector:             0,
+		BlockIssuedCount:               0,
+		HighestSupportedVersionAndHash: VersionAndHash{},
+	}
+}
+
+func ValidatorPerformanceFromBytes(decodeAPI iotago.API) func([]byte) (*ValidatorPerformance, int, error) {
+	return func(bytes []byte) (*ValidatorPerformance, int, error) {
+		validatorPerformance := new(ValidatorPerformance)
+		consumedBytes, err := decodeAPI.Decode(bytes, validatorPerformance)
+		if err != nil {
+			return nil, 0, err
+		}
+
+		return validatorPerformance, consumedBytes, nil
+	}
+}
+
+func (p *ValidatorPerformance) Bytes(api iotago.API) ([]byte, error) {
+	return api.Encode(p)
+}

pkg/model/version_and_hash.go

@@ -10,8 +10,8 @@ import (
 const VersionAndHashSize = iotago.IdentifierLength + iotago.VersionLength
 
 type VersionAndHash struct {
-	Version iotago.Version
-	Hash    iotago.Identifier
+	Version iotago.Version    `serix:"0"`
+	Hash    iotago.Identifier `serix:"1"`
 }
 
 func (v VersionAndHash) Bytes() ([]byte, error) {