x

Author: coderbradlee

action/protocol/staking/candidate_buckets_indexer.go

@@ -8,6 +8,11 @@ package staking
 
 import (
 	"context"
+	"encoding/hex"
+	"fmt"
+	"math/big"
+
+	"github.com/iotexproject/iotex-address/address"
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/pkg/errors"
@@ -171,3 +176,26 @@ func (cbi *CandidatesBucketsIndexer) GetBuckets(height uint64, offset, limit uin
 	d, err := proto.Marshal(buckets)
 	return d, height, err
 }
+
+// PutStakingBalance sets staking balance
+func (cbi *CandidatesBucketsIndexer) PutStakingBalance(height uint64, total *totalAmount) error {
+	hei := byteutil.Uint64ToBytesBigEndian(height - 1)
+	historyKey := append(bucketPoolAddrKey, hei...)
+	fmt.Println("PutStakingBalance", height, []byte(StakingBucketsNamespace), hex.EncodeToString(historyKey), total.amount)
+	return cbi.kvStore.Put(StakingBucketsNamespace, historyKey, total.amount.Bytes())
+}
+
+// GetStakingBalance gets staking balance
+func (cbi *CandidatesBucketsIndexer) GetStakingBalance(height uint64) (*iotextypes.AccountMeta, uint64, error) {
+	hei := byteutil.Uint64ToBytesBigEndian(height)
+	historyKey := append(bucketPoolAddrKey, hei...)
+	fmt.Println("GetStakingBalance", height, []byte(StakingBucketsNamespace), hex.EncodeToString(historyKey))
+	balanceBytes, err := cbi.kvStore.Get(StakingBucketsNamespace, historyKey)
+	if err != nil {
+		return nil, 0, err
+	}
+	meta := iotextypes.AccountMeta{}
+	meta.Address = address.StakingBucketPoolAddr
+	meta.Balance = big.NewInt(0).SetBytes(balanceBytes).String()
+	return &meta, height, nil
+}

action/protocol/staking/protocol.go

@@ -8,7 +8,6 @@ package staking
 
 import (
 	"context"
-	"encoding/hex"
 	"fmt"
 	"math/big"
 	"time"
@@ -29,7 +28,6 @@ import (
 	"github.com/iotexproject/iotex-core/blockchain/genesis"
 	"github.com/iotexproject/iotex-core/config"
 	"github.com/iotexproject/iotex-core/pkg/log"
-	"github.com/iotexproject/iotex-core/pkg/util/byteutil"
 	"github.com/iotexproject/iotex-core/state"
 )
 
@@ -222,13 +220,7 @@ func (p *Protocol) CreatePreStates(ctx context.Context, sm protocol.StateManager
 	bcCtx := protocol.MustGetBlockchainCtx(ctx)
 	blkCtx := protocol.MustGetBlockCtx(ctx)
 	hu := config.NewHeightUpgrade(&bcCtx.Genesis)
-	fmt.Println("CreatePreStates///////", blkCtx.BlockHeight, p.hu.FairbankBlockHeight(), p.hu.GreenlandBlockHeight())
-	if p.archiveMode && blkCtx.BlockHeight <= p.hu.GreenlandBlockHeight() && blkCtx.BlockHeight > 1 {
-		if err := p.saveStakingAddressHistory(blkCtx.BlockHeight, sm); err != nil {
-			fmt.Println("saveStakingAddressHistory errrrr", err)
-			return err
-		}
-	}
+
 	if blkCtx.BlockHeight == hu.GreenlandBlockHeight() {
 		csr, err := ConstructBaseView(sm)
 		if err != nil {
@@ -251,6 +243,13 @@ func (p *Protocol) CreatePreStates(ctx context.Context, sm protocol.StateManager
 	if p.candBucketsIndexer == nil {
 		return nil
 	}
+	fmt.Println("CreatePreStates///////", blkCtx.BlockHeight, p.hu.FairbankBlockHeight(), p.hu.GreenlandBlockHeight())
+	if p.archiveMode && blkCtx.BlockHeight <= p.hu.GreenlandBlockHeight() && blkCtx.BlockHeight > 1 {
+		if err := p.saveStakingAddressHistory(blkCtx.BlockHeight, sm); err != nil {
+			fmt.Println("saveStakingAddressHistory errrrr", err)
+			return err
+		}
+	}
 	rp := rolldpos.MustGetProtocol(protocol.MustGetRegistry(ctx))
 	currentEpochNum := rp.GetEpochNum(blkCtx.BlockHeight)
 	if currentEpochNum == 0 {
@@ -274,14 +273,7 @@ func (p *Protocol) saveStakingAddressHistory(height uint64, sm protocol.StateMan
 	if balance.amount.Sign() <= 0 {
 		return nil
 	}
-
-	hei := byteutil.Uint64ToBytesBigEndian(height - 1)
-	//hei := byteutil.Uint64ToBytesBigEndian(height)
-	historyKey := append(bucketPoolAddrKey, hei...)
-	fmt.Println("saveStakingAddressHistory2", height, []byte(StakingNameSpaceForStakingAddress), hex.EncodeToString(historyKey), balance.amount)
-
-	_, err = sm.PutState(balance, protocol.NamespaceOption(StakingNameSpaceForStakingAddress), protocol.KeyOption(historyKey))
-	return err
+	return p.candBucketsIndexer.PutStakingBalance(height, balance)
 }
 
 func (p *Protocol) handleStakingIndexer(epochStartHeight uint64, sm protocol.StateManager) error {
@@ -479,10 +471,7 @@ func (p *Protocol) ReadState(ctx context.Context, sr protocol.StateReader, metho
 		resp, height, err = readStateCandidateByAddress(ctx, csr, r.GetCandidateByAddress())
 	case iotexapi.ReadStakingDataMethod_TOTAL_STAKING_AMOUNT:
 		if p.archiveMode && inputHeight <= p.hu.GreenlandBlockHeight() {
-			resp, height, err = readStateTotalStakingAmountFromIndexer(sr, r.GetTotalStakingAmount(), inputHeight)
-			//if err != nil {
-			//	resp, height, err = readStateTotalStakingAmount(ctx, csr, r.GetTotalStakingAmount())
-			//}
+			resp, height, err = p.candBucketsIndexer.GetStakingBalance(inputHeight)
 		} else {
 			resp, height, err = readStateTotalStakingAmount(ctx, csr, r.GetTotalStakingAmount())
 		}

action/protocol/staking/read_state.go

@@ -8,8 +8,6 @@ package staking
 
 import (
 	"context"
-	"encoding/hex"
-	"fmt"
 	"math/big"
 
 	"github.com/pkg/errors"
@@ -20,7 +18,6 @@ import (
 
 	"github.com/iotexproject/iotex-core/action/protocol"
 	"github.com/iotexproject/iotex-core/config"
-	"github.com/iotexproject/iotex-core/pkg/util/byteutil"
 	"github.com/iotexproject/iotex-core/state"
 )
 
@@ -147,18 +144,6 @@ func readStateTotalStakingAmount(ctx context.Context, csr CandidateStateReader,
 	return &meta, csr.Height(), nil
 }
 
-func readStateTotalStakingAmountFromIndexer(csr protocol.StateReader, _ *iotexapi.ReadStakingDataRequest_TotalStakingAmount, height uint64) (*iotextypes.AccountMeta, uint64, error) {
-	fmt.Println("readStateTotalStakingAmountFromHeight", height)
-	meta := iotextypes.AccountMeta{}
-	meta.Address = address.StakingBucketPoolAddr
-	total, err := getTotalStakedAmountFromIndexer(csr, height)
-	if err != nil {
-		return nil, height, err
-	}
-	meta.Balance = total.String()
-	return &meta, height, nil
-}
-
 func toIoTeXTypesVoteBucketList(buckets []*VoteBucket) (*iotextypes.VoteBucketList, error) {
 	res := iotextypes.VoteBucketList{
 		Buckets: make([]*iotextypes.VoteBucket, 0, len(buckets)),
@@ -231,15 +216,3 @@ func getTotalStakedAmount(ctx context.Context, csr CandidateStateReader) (*big.I
 	// otherwise read from bucket pool
 	return csr.TotalStakedAmount(), nil
 }
-
-func getTotalStakedAmountFromIndexer(csr protocol.StateReader, height uint64) (*big.Int, error) {
-	hei := byteutil.Uint64ToBytesBigEndian(height)
-	historyKey := append(bucketPoolAddrKey, hei...)
-	var total totalAmount
-	_, err := csr.State(&total, protocol.NamespaceOption(StakingNameSpaceForStakingAddress), protocol.KeyOption(historyKey))
-	fmt.Println("getTotalStakedAmountFromHeight", height, []byte(StakingNameSpaceForStakingAddress), hex.EncodeToString(historyKey), err)
-	if err != nil {
-		return nil, err
-	}
-	return total.amount, nil
-}