cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

retesteth: clean txpool on rewind, default dao support (#20596)

Browse Source
This commit is contained in:
Martin Holst Swende 2020-01-31 12:00:37 +01:00 committed by GitHub
parent 24cab2d535
commit 3c776c7199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/geth/retesteth.go
View File

@ -355,7 +355,7 @@ func (api *RetestethAPI) SetChainParams(ctx context.Context, chainParams ChainPa
ChainID: chainId, ChainID: chainId,
HomesteadBlock: homesteadBlock, HomesteadBlock: homesteadBlock,
DAOForkBlock: daoForkBlock, DAOForkBlock: daoForkBlock,
DAOForkSupport: false, DAOForkSupport: true,
EIP150Block: eip150Block, EIP150Block: eip150Block,
EIP155Block: eip155Block, EIP155Block: eip155Block,
EIP158Block: eip158Block, EIP158Block: eip158Block,
@ -579,6 +579,9 @@ func (api *RetestethAPI) RewindToBlock(ctx context.Context, newHead uint64) (boo
if err := api.blockchain.SetHead(newHead); err != nil { if err := api.blockchain.SetHead(newHead); err != nil {
return false, err return false, err
} }
// When we rewind, the transaction pool should be cleaned out.
api.txMap = make(map[common.Address]map[uint64]*types.Transaction)
api.txSenders = make(map[common.Address]struct{})
return true, nil return true, nil
} }