diff options
| author | Bas van Kervel <bas@ethdev.com> | 2016-05-13 01:32:04 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-05-24 15:32:45 +0800 |
| commit | b950a2977c6d74c9150fd37b7cf7fb20c762baf7 (patch) | |
| tree | 53f517a949d469bc5d815245014d6a4f6cf761b5 /eth/backend.go | |
| parent | 4c6953606eec74d7b55b061872394aa14e975137 (diff) | |
| download | go-tangerine-b950a2977c6d74c9150fd37b7cf7fb20c762baf7.tar go-tangerine-b950a2977c6d74c9150fd37b7cf7fb20c762baf7.tar.gz go-tangerine-b950a2977c6d74c9150fd37b7cf7fb20c762baf7.tar.bz2 go-tangerine-b950a2977c6d74c9150fd37b7cf7fb20c762baf7.tar.lz go-tangerine-b950a2977c6d74c9150fd37b7cf7fb20c762baf7.tar.xz go-tangerine-b950a2977c6d74c9150fd37b7cf7fb20c762baf7.tar.zst go-tangerine-b950a2977c6d74c9150fd37b7cf7fb20c762baf7.zip | |
[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
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 4 |
1 files changed, 3 insertions, 1 deletions
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", |