mirror of https://github.com/poanetwork/quorum.git
Revert fix for eth_estimateGas due to side-effect where attempt to purely read private state doesn't work correctly.
This commit is contained in:
parent
f02d8d642d
commit
470f34a784
|
@ -142,24 +142,14 @@ func (b *EthAPIBackend) GetTd(blockHash common.Hash) *big.Int {
|
||||||
return b.eth.blockchain.GetTdByHash(blockHash)
|
return b.eth.blockchain.GetTdByHash(blockHash)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *EthAPIBackend) GetEVM(ctx context.Context, msg core.Message, apiState vm.MinimalApiState, header *types.Header, vmCfg vm.Config) (*vm.EVM, func() error, error) {
|
func (b *EthAPIBackend) GetEVM(ctx context.Context, msg core.Message, state vm.MinimalApiState, header *types.Header, vmCfg vm.Config) (*vm.EVM, func() error, error) {
|
||||||
statedb := apiState.(EthAPIState)
|
statedb := state.(EthAPIState)
|
||||||
|
|
||||||
// Need to ensure private state is initialised (similar to state_processor.go), else we get issues
|
|
||||||
// further down the line when checking for calls from private state to public state.
|
|
||||||
var privateState *state.StateDB
|
|
||||||
if msg, ok := msg.(core.PrivateMessage); ok && b.ChainConfig().IsQuorum && msg.IsPrivate() {
|
|
||||||
privateState = statedb.privateState
|
|
||||||
} else {
|
|
||||||
privateState = statedb.state
|
|
||||||
}
|
|
||||||
|
|
||||||
from := statedb.state.GetOrNewStateObject(msg.From())
|
from := statedb.state.GetOrNewStateObject(msg.From())
|
||||||
from.SetBalance(math.MaxBig256)
|
from.SetBalance(math.MaxBig256)
|
||||||
vmError := func() error { return nil }
|
vmError := func() error { return nil }
|
||||||
|
|
||||||
context := core.NewEVMContext(msg, header, b.eth.BlockChain(), nil)
|
context := core.NewEVMContext(msg, header, b.eth.BlockChain(), nil)
|
||||||
return vm.NewEVM(context, statedb.state, privateState, b.eth.chainConfig, vmCfg), vmError, nil
|
return vm.NewEVM(context, statedb.state, statedb.privateState, b.eth.chainConfig, vmCfg), vmError, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *EthAPIBackend) SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent) event.Subscription {
|
func (b *EthAPIBackend) SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent) event.Subscription {
|
||||||
|
|
Loading…
Reference in New Issue