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

1 files changed, 4 insertions, 14 deletions

diff --git a/ui/frontend.go b/ui/frontend.go
index 22dc64fdf..413a24259 100644
--- a/ui/frontend.go
+++ b/ui/frontend.go
@@ -1,18 +1,8 @@
 package ui
 
-// ReturnInterface is returned by the Intercom interface when a method is called
-type ReturnInterface interface {
-	Get(i int) (interface{}, error)
-	Size() int
-}
+import "github.com/ethereum/go-ethereum/core/types"
 
-// Frontend is the basic interface for calling arbitrary methods on something that
-// implements a front end (GUI, CLI, etc)
-type Frontend interface {
-	// Checks whether a specific method is implemented
-	Supports(method string) bool
-	// Call calls the given method on interface it implements. This will return
-	// an error with errNotImplemented if the method hasn't been implemented
-	// and will return a ReturnInterface if it does.
-	Call(method string) (ReturnInterface, error)
+type Interface interface {
+	UnlockAccount(address []byte) bool
+	ConfirmTransaction(tx *types.Transaction) bool
 }