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.

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

Add mempool nonce into response of getBalance rpc method #779

Merged
merged 1 commit into from
Aug 25, 2021
Merged
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions api/dna_api.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ func (api *DnaApi) GetCoinbaseAddr() common.Address {
}

type Balance struct {
Stake decimal.Decimal `json:"stake"`
Balance decimal.Decimal `json:"balance"`
Nonce uint32 `json:"nonce"`
Stake decimal.Decimal `json:"stake"`
Balance decimal.Decimal `json:"balance"`
Nonce uint32 `json:"nonce"`
MempoolNonce uint32 `json:"mempoolNonce"`
}

func (api *DnaApi) GetBalance(address common.Address) Balance {
Expand All @@ -64,9 +65,10 @@ func (api *DnaApi) GetBalance(address common.Address) Balance {
}

return Balance{
Stake: blockchain.ConvertToFloat(state.State.GetStakeBalance(address)),
Balance: blockchain.ConvertToFloat(state.State.GetBalance(address)),
Nonce: nonce,
Stake: blockchain.ConvertToFloat(state.State.GetStakeBalance(address)),
Balance: blockchain.ConvertToFloat(state.State.GetBalance(address)),
Nonce: nonce,
MempoolNonce: state.NonceCache.GetNonce(address, currentEpoch),
}
}

Expand Down