forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth, internal: Changes in response to review

Browse source
This commit is contained in:
Nick Johnson 2017-11-19 14:36:46 +01:00
parent 7df396d9ce
commit f45aabf843
2 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
eth/api.go
View file

@ -637,17 +637,40 @@ func storageRangeAt(st state.Trie, start []byte, maxResult int) StorageRangeResu
return result return result
} }
func (api *PrivateDebugAPI) GetDirtyAccountsByNumber(startNum, endNum uint64) ([]common.Address, error) { // GetModifiedAccountsByumber returns all accounts that have changed between the
return api.getDirtyAccounts(api.eth.blockchain.GetBlockByNumber(startNum), api.eth.blockchain.GetBlockByNumber(endNum)) // two blocks specified. A change is defined as a difference in nonce, balance,
// code hash, or storage hash.
// With one parameter, returns the list of accounts modified in the specified block.
func (api *PrivateDebugAPI) GetModifiedAccountsByNumber(startNum, endNum *uint64) ([]common.Address, error) {
// With one argument, compare x-1 with x
if endNum == nil {
return api.getModifiedAccounts(
api.eth.blockchain.GetBlockByNumber(*startNum - 1),
api.eth.blockchain.GetBlockByNumber(*startNum))
} else {
return api.getModifiedAccounts(
api.eth.blockchain.GetBlockByNumber(*startNum),
api.eth.blockchain.GetBlockByNumber(*endNum))
}
} }
func (api *PrivateDebugAPI) GetDirtyAccountsByHash(startHash, endHash common.Hash) ([]common.Address, error) { // GetModifiedAccountsByHash returns all accounts that have changed between the
return api.getDirtyAccounts( // two blocks specified. A change is defined as a difference in nonce, balance,
// code hash, or storage hash.
func (api *PrivateDebugAPI) GetModifiedAccountsByHash(startHash, endHash common.Hash) ([]common.Address, error) {
return api.getModifiedAccounts(
api.eth.blockchain.GetBlockByHash(startHash), api.eth.blockchain.GetBlockByHash(startHash),
api.eth.blockchain.GetBlockByHash(endHash)) api.eth.blockchain.GetBlockByHash(endHash))
} }
func (api *PrivateDebugAPI) getDirtyAccounts(startBlock, endBlock *types.Block) ([]common.Address, error) { func (api *PrivateDebugAPI) getModifiedAccounts(startBlock, endBlock *types.Block) ([]common.Address, error) {
if startBlock == nil || endBlock == nil {
return nil, fmt.Errorf("Both start block and end block are required")
}
if startBlock.Number().Uint64() >= endBlock.Number().Uint64() {
return nil, fmt.Errorf("Start block height (%d) must be less than end block height (%d)", startBlock.Number().Uint64(), endBlock.Number().Uint64())
}
oldTrie, err := trie.NewSecure(startBlock.Root(), api.eth.chainDb, 0) oldTrie, err := trie.NewSecure(startBlock.Root(), api.eth.chainDb, 0)
if err != nil { if err != nil {
return nil, err return nil, err
@ -662,7 +685,11 @@ func (api *PrivateDebugAPI) getDirtyAccounts(startBlock, endBlock *types.Block)
iter := trie.NewIterator(diff) iter := trie.NewIterator(diff)
var dirty []common.Address var dirty []common.Address
for iter.Next() { for iter.Next() {
dirty = append(dirty, common.BytesToAddress(newTrie.GetKey(iter.Key))) key := newTrie.GetKey(iter.Key)
if(key == nil) {
return nil, fmt.Errorf("No preimage found for hash %x", iter.Key)
}
dirty = append(dirty, common.BytesToAddress(key))
} }
return dirty, nil return dirty, nil
} }

10
internal/web3ext/web3ext.go
View file

@ -355,16 +355,16 @@ web3._extend({
params: 5, params: 5,
}), }),
new web3._extend.Method({ new web3._extend.Method({
name: 'getDirtyAccountsByNumber', name: 'getModifiedAccountsByNumber',
call: 'debug_getDirtyAccountsByNumber', call: 'debug_getModifiedAccountsByNumber',
params: 2, params: 2,
inputFormatter: [null, null], inputFormatter: [null, null],
}), }),
new web3._extend.Method({ new web3._extend.Method({
name: 'getDirtyAccountsByHash', name: 'getModifiedAccountsByHash',
call: 'debug_getDirtyAccountsByHash', call: 'debug_getModifiedAccountsByHash',
params: 2, params: 2,
inputFormatter:[web3._extend.formatters.inputAddressFormatter, web3._extend.formatters.inputAddressFormatter], inputFormatter:[null, null],
}), }),
], ],
properties: [] properties: []