Merge ethereum/poc-9 into accounts-integration
Conflicts: cmd/utils/cmd.go cmd/utils/flags.go core/manager.go eth/backend.go rpc/http/server.go xeth/xeth.go
This commit is contained in:
@ -85,7 +85,7 @@ func NewWindow(ethereum *eth.Ethereum) *Gui {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
xeth := xeth.New(ethereum)
|
||||
xeth := xeth.New(ethereum, nil)
|
||||
gui := &Gui{eth: ethereum,
|
||||
txDb: db,
|
||||
xeth: xeth,
|
||||
|
Reference in New Issue
Block a user