Merge branch 'develop' into 1.0

This commit is contained in:
Fabian Vogelsteller 2017-01-05 15:42:39 +01:00
commit 414b54c9ca
No known key found for this signature in database
GPG Key ID: E51EADA77F1A4124

View File

@ -58,9 +58,9 @@ var methods = function () {
inputFormatter: [formatters.inputAddressFormatter, null, null]
});
var unlockAccountAndSendTransaction = new Method({
name: 'unlockAccountAndSendTransaction', // sendTransaction
call: 'personal_signAndSendTransaction', // personal_sendTransaction
var sendTransaction = new Method({
name: 'sendTransaction',
call: 'personal_sendTransaction',
params: 2,
inputFormatter: [formatters.inputTransactionFormatter, null]
});
@ -75,7 +75,7 @@ var methods = function () {
return [
newAccount,
unlockAccount,
unlockAccountAndSendTransaction,
sendTransaction,
lockAccount
];
};