diff options
| author | Wei-Ning Huang <aitjcize@gmail.com> | 2018-11-13 15:26:21 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 91a4a2d552a13dfbd7f58bbfa2a9dd7215d72ea0 (patch) | |
| tree | 2bd2bae2f1ccb52b3be644b4d5400db14ee3c527 /dex | |
| parent | 143a9b6e1d2fc7c9360bbc5c0bdd8b715ce80191 (diff) | |
| download | dexon-91a4a2d552a13dfbd7f58bbfa2a9dd7215d72ea0.tar dexon-91a4a2d552a13dfbd7f58bbfa2a9dd7215d72ea0.tar.gz dexon-91a4a2d552a13dfbd7f58bbfa2a9dd7215d72ea0.tar.bz2 dexon-91a4a2d552a13dfbd7f58bbfa2a9dd7215d72ea0.tar.lz dexon-91a4a2d552a13dfbd7f58bbfa2a9dd7215d72ea0.tar.xz dexon-91a4a2d552a13dfbd7f58bbfa2a9dd7215d72ea0.tar.zst dexon-91a4a2d552a13dfbd7f58bbfa2a9dd7215d72ea0.zip | |
dex: return correct pending nonce (#14)
We need to return the correct pending nonce (include those in the tx
pool). Also, StateAndHeaderByNumber is also fixed to use pending block.
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/api_backend.go | 3 | ||||
| -rw-r--r-- | dex/app.go | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/dex/api_backend.go b/dex/api_backend.go index 411855bf3..172b4ec44 100644 --- a/dex/api_backend.go +++ b/dex/api_backend.go @@ -80,7 +80,8 @@ func (b *DexAPIBackend) BlockByNumber(ctx context.Context, blockNr rpc.BlockNumb func (b *DexAPIBackend) StateAndHeaderByNumber(ctx context.Context, blockNr rpc.BlockNumber) (*state.StateDB, *types.Header, error) { if blockNr == rpc.PendingBlockNumber { - blockNr = rpc.BlockNumber(b.dex.blockchain.CurrentBlock().Header().Number.Uint64()) + block, state := b.dex.BlockChain().GetPending() + return state, block.Header(), nil } header, err := b.HeaderByNumber(ctx, blockNr) if header == nil || err != nil { diff --git a/dex/app.go b/dex/app.go index d0d911e86..a90dfae37 100644 --- a/dex/app.go +++ b/dex/app.go @@ -275,13 +275,13 @@ addressMap: // PrepareWitness will return the witness data no lower than consensusHeight. func (d *DexconApp) PrepareWitness(consensusHeight uint64) (witness coreTypes.Witness, err error) { var witnessBlock *types.Block - lastPendingHeight := d.blockchain.GetLastPendingHeight() + lastPendingHeight := d.blockchain.GetPendingHeight() if lastPendingHeight == 0 && consensusHeight == 0 { witnessBlock = d.blockchain.CurrentBlock() } else if lastPendingHeight >= consensusHeight { - witnessBlock = d.blockchain.GetLastPendingBlock() + witnessBlock = d.blockchain.GetPendingBlock() } else if h := <-d.addNotify(consensusHeight); h >= consensusHeight { - witnessBlock = d.blockchain.GetLastPendingBlock() + witnessBlock = d.blockchain.GetPendingBlock() } else { log.Error("need pending block") return witness, fmt.Errorf("need pending block") |