Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix: QiRateAtBlock and QuaiRateAtBlock should allow for latest block selection #2273

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −2
Open

Bugfix: QiRateAtBlock and QuaiRateAtBlock should allow for latest block selection #2273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions internal/quaiapi/quai_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,11 @@ func (s *PublicBlockChainQuaiAPI) QiRateAtBlock(ctx context.Context, blockNrOrHa
var header *types.WorkObject
var err error
if blockNr, ok := blockNrOrHash.Number(); ok {
header, err = s.b.HeaderByNumber(ctx, rpc.BlockNumber(blockNr))
if blockNr == rpc.LatestBlockNumber {
header = s.b.CurrentHeader()
} else {
header, err = s.b.HeaderByNumber(ctx, rpc.BlockNumber(blockNr))
}
} else if hash, ok := blockNrOrHash.Hash(); ok {
header, err = s.b.HeaderByHash(ctx, hash)
} else {
Expand All @@ -821,6 +825,8 @@ func (s *PublicBlockChainQuaiAPI) QiRateAtBlock(ctx context.Context, blockNrOrHa
if err != nil {
s.b.Logger().WithField("err", err).Error("Error calculating QiRateAtBlock")
return nil
} else if header == nil {
return nil
}
return (*hexutil.Big)(misc.QiToQuai(header, new(big.Int).SetUint64(qiAmount)))
}
Expand All @@ -830,7 +836,11 @@ func (s *PublicBlockChainQuaiAPI) QuaiRateAtBlock(ctx context.Context, blockNrOr
var header *types.WorkObject
var err error
if blockNr, ok := blockNrOrHash.Number(); ok {
header, err = s.b.HeaderByNumber(ctx, rpc.BlockNumber(blockNr))
if blockNr == rpc.LatestBlockNumber {
header = s.b.CurrentHeader()
} else {
header, err = s.b.HeaderByNumber(ctx, rpc.BlockNumber(blockNr))
}
} else if hash, ok := blockNrOrHash.Hash(); ok {
header, err = s.b.HeaderByHash(ctx, hash)
} else {
Expand All @@ -839,6 +849,8 @@ func (s *PublicBlockChainQuaiAPI) QuaiRateAtBlock(ctx context.Context, blockNrOr
if err != nil {
s.b.Logger().WithField("err", err).Error("Error calculating QuaiRateAtBlock")
return nil
} else if header == nil {
return nil
}
return (*hexutil.Big)(misc.QuaiToQi(header, new(big.Int).SetUint64(quaiAmount)))
}
Expand Down
Loading