RewardValidatorTx cleanup

vms/platformvm/blocks/executor/proposal_block_test.go

@@ -95,6 +95,7 @@ func TestApricotProposalBlockTimeVerification(t *testing.T) {
 		NodeID:    utx.NodeID(),
 		SubnetID:  utx.SubnetID(),
 		StartTime: utx.StartTime(),
+		NextTime:  chainTime,
 		EndTime:   chainTime,
 	}).Times(2)
 	currentStakersIt.EXPECT().Release()
@@ -104,6 +105,7 @@ func TestApricotProposalBlockTimeVerification(t *testing.T) {
 		NodeID:    utx.NodeID(),
 		SubnetID:  utx.SubnetID(),
 		StartTime: utx.StartTime(),
+		NextTime:  chainTime,
 		EndTime:   chainTime,
 	}, nil)
 	onParentAccept.EXPECT().GetTx(addValTx.ID()).Return(addValTx, status.Committed, nil)

vms/platformvm/reward/calculator.go

@@ -6,6 +6,8 @@ package reward
 import (
 	"math/big"
 	"time"
+
+	safemath "github.com/ava-labs/avalanchego/utils/math"
 )
 
 var _ Calculator = (*calculator)(nil)
@@ -67,3 +69,16 @@ func (c *calculator) Calculate(stakedDuration time.Duration, stakedAmount, curre
 
 	return finalReward
 }
+
+func Split(totalAmount uint64, shares uint32) (uint64, uint64) {
+	remainderShares := PercentDenominator - uint64(shares)
+	remainderAmount := remainderShares * (totalAmount / PercentDenominator)
+
+	// Delay rounding as long as possible for small numbers
+	if optimisticReward, err := safemath.Mul64(remainderShares, totalAmount); err == nil {
+		remainderAmount = optimisticReward / PercentDenominator
+	}
+
+	amountFromShares := totalAmount - remainderAmount
+	return remainderAmount, amountFromShares
+}