x

Author: coderbradlee

action/protocol/staking/protocol.go

@@ -220,7 +220,7 @@ func (p *Protocol) CreatePreStates(ctx context.Context, sm protocol.StateManager
 	blkCtx := protocol.MustGetBlockCtx(ctx)
 	hu := config.NewHeightUpgrade(&bcCtx.Genesis)
 	fmt.Println("CreatePreStates///////", blkCtx.BlockHeight, p.hu.FairbankBlockHeight(), p.hu.GreenlandBlockHeight())
-	if p.archiveMode && p.hu.IsPre(config.Greenland, blkCtx.BlockHeight) && blkCtx.BlockHeight > 1 {
+	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
@@ -475,7 +475,7 @@ func (p *Protocol) ReadState(ctx context.Context, sr protocol.StateReader, metho
 	case iotexapi.ReadStakingDataMethod_CANDIDATE_BY_ADDRESS:
 		resp, height, err = readStateCandidateByAddress(ctx, csr, r.GetCandidateByAddress())
 	case iotexapi.ReadStakingDataMethod_TOTAL_STAKING_AMOUNT:
-		if p.archiveMode && p.hu.IsPre(config.Greenland, inputHeight) {
+		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())

action/protocol/staking/read_state.go

@@ -151,7 +151,7 @@ func readStateTotalStakingAmountFromIndexer(csr protocol.StateReader, _ *iotexap
 	fmt.Println("readStateTotalStakingAmountFromHeight", height)
 	meta := iotextypes.AccountMeta{}
 	meta.Address = address.StakingBucketPoolAddr
-	total, err := getTotalStakedAmountFromHeight(csr, height)
+	total, err := getTotalStakedAmountFromIndexer(csr, height)
 	if err != nil {
 		return nil, height, err
 	}
@@ -232,11 +232,14 @@ func getTotalStakedAmount(ctx context.Context, csr CandidateStateReader) (*big.I
 	return csr.TotalStakedAmount(), nil
 }
 
-func getTotalStakedAmountFromHeight(csr protocol.StateReader, height uint64) (*big.Int, error) {
+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(StakingNameSpace), protocol.KeyOption(historyKey))
 	fmt.Println("getTotalStakedAmountFromHeight", height, hex.EncodeToString(historyKey), err)
-	return total.amount, err
+	if err != nil {
+		return nil, err
+	}
+	return total.amount, nil
 }