From 4ee00b230931b054576606ead90c56d8c984fc38 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <bas@ethdev.com>
Date: Fri, 15 Jul 2016 10:43:32 +0200
Subject: eth/api: rename signAndSendTransaction to sendTransaction
---
internal/ethapi/api.go | 10 ++++++++--
internal/web3ext/web3ext.go | 4 ++--
2 files changed, 10 insertions(+), 4 deletions(-)
(limited to 'internal')
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index f604a0ef2..88bacc45b 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -303,10 +303,10 @@ func (s *PrivateAccountAPI) LockAccount(addr common.Address) bool {
return s.am.Lock(addr) == nil
}
-// SignAndSendTransaction will create a transaction from the given arguments and
+// SendTransaction will create a transaction from the given arguments and
// tries to sign it with the key associated with args.To. If the given passwd isn't
// able to decrypt the key it fails.
-func (s *PrivateAccountAPI) SignAndSendTransaction(ctx context.Context, args SendTxArgs, passwd string) (common.Hash, error) {
+func (s *PrivateAccountAPI) SendTransaction(ctx context.Context, args SendTxArgs, passwd string) (common.Hash, error) {
var err error
args, err = prepareSendTxArgs(ctx, args, s.b)
if err != nil {
@@ -336,6 +336,12 @@ func (s *PrivateAccountAPI) SignAndSendTransaction(ctx context.Context, args Sen
return submitTransaction(ctx, s.b, tx, signature)
}
+// SignAndSendTransaction was renamed to SendTransaction. This method is deprecated
+// and will be removed in the future. It primary goal is to give clients time to update.
+func (s *PrivateAccountAPI) SignAndSendTransaction(ctx context.Context, args SendTxArgs, passwd string) (common.Hash, error) {
+ return s.SendTransaction(ctx, args, passwd)
+}
+
// PublicBlockChainAPI provides an API to access the Ethereum blockchain.
// It offers only methods that operate on public data that is freely available to anyone.
type PublicBlockChainAPI struct {
diff --git a/internal/web3ext/web3ext.go b/internal/web3ext/web3ext.go
index 162cf7096..190fd57d2 100644
--- a/internal/web3ext/web3ext.go
+++ b/internal/web3ext/web3ext.go
@@ -418,8 +418,8 @@ web3._extend({
params: 2
}),
new web3._extend.Method({
- name: 'signAndSendTransaction',
- call: 'personal_signAndSendTransaction',
+ name: 'sendTransaction',
+ call: 'personal_sendTransaction',
params: 2,
inputFormatter: [web3._extend.formatters.inputTransactionFormatter, null]
})
--
cgit v1.2.3