From b950a2977c6d74c9150fd37b7cf7fb20c762baf7 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <bas@ethdev.com>
Date: Thu, 12 May 2016 19:32:04 +0200
Subject: [release/1.4.5] eth: add new RPC method (personal.)
 SignAndSendTransaction

(cherry picked from commit 64a6c2c1b6c81fddccc7d3d728b7a05c5814124b)

Conflicts:
	cmd/geth/js.go
	internal/web3ext/web3ext.go
---
 eth/backend.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'eth/backend.go')

diff --git a/eth/backend.go b/eth/backend.go
index f43dea777..bb487650b 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -26,6 +26,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/ethereum/ethash"
@@ -113,6 +114,7 @@ type Ethereum struct {
 
 	// Handlers
 	txPool          *core.TxPool
+	txMu            sync.Mutex
 	blockchain      *core.BlockChain
 	accountManager  *accounts.Manager
 	pow             *ethash.Ethash
@@ -293,7 +295,7 @@ func (s *Ethereum) APIs() []rpc.API {
 		}, {
 			Namespace: "personal",
 			Version:   "1.0",
-			Service:   NewPrivateAccountAPI(s.accountManager),
+			Service:   NewPrivateAccountAPI(s),
 			Public:    false,
 		}, {
 			Namespace: "eth",
-- 
cgit v1.2.3