mirror of
https://github.com/status-im/web3.js.git
synced 2025-02-23 11:38:12 +00:00
Merge branch 'develop' into 1.0
This commit is contained in:
commit
414b54c9ca
@ -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
|
||||
];
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user