x

Author: coderbradlee

action/protocol/staking/protocol.go

@@ -271,8 +271,8 @@ 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)
+	hei := byteutil.Uint64ToBytesBigEndian(height - 1)
+	//hei := byteutil.Uint64ToBytesBigEndian(height)
 	historyKey := append(bucketPoolAddrKey, hei...)
 	fmt.Println("saveStakingAddressHistory2", height, hex.EncodeToString(historyKey), balance.amount)
 
@@ -475,7 +475,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 && p.hu.IsPre(config.Greenland, height) {
-			resp, height, err = readStateTotalStakingAmountFromIndexer(csr, r.GetTotalStakingAmount(), inputHeight)
+			resp, height, err = readStateTotalStakingAmountFromIndexer(sr, r.GetTotalStakingAmount(), inputHeight)
 		} else {
 			resp, height, err = readStateTotalStakingAmount(ctx, csr, r.GetTotalStakingAmount())
 		}

action/protocol/staking/read_state.go

@@ -147,7 +147,7 @@ func readStateTotalStakingAmount(ctx context.Context, csr CandidateStateReader,
 	return &meta, csr.Height(), nil
 }
 
-func readStateTotalStakingAmountFromIndexer(csr CandidateStateReader, _ *iotexapi.ReadStakingDataRequest_TotalStakingAmount, height uint64) (*iotextypes.AccountMeta, uint64, error) {
+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
@@ -232,11 +232,11 @@ func getTotalStakedAmount(ctx context.Context, csr CandidateStateReader) (*big.I
 	return csr.TotalStakedAmount(), nil
 }
 
-func getTotalStakedAmountFromHeight(csr CandidateStateReader, height uint64) (*big.Int, error) {
+func getTotalStakedAmountFromHeight(csr protocol.StateReader, height uint64) (*big.Int, error) {
 	hei := byteutil.Uint64ToBytesBigEndian(height)
 	historyKey := append(bucketPoolAddrKey, hei...)
 	var total totalAmount
-	_, err := csr.SR().State(&total, protocol.NamespaceOption(StakingNameSpace), protocol.KeyOption(historyKey))
+	_, err := csr.State(&total, protocol.NamespaceOption(StakingNameSpace), protocol.KeyOption(historyKey))
 	fmt.Println("getTotalStakedAmountFromHeight", height, hex.EncodeToString(historyKey), err)
 	return total.amount, err
 }