merged master

This commit is contained in:
Fabian Vogelsteller 2015-06-23 14:40:30 +02:00
commit 16ffdf6f04
7 changed files with 14898 additions and 103 deletions

7416
dist/web3-light.js vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

7418
dist/web3.js vendored

File diff suppressed because it is too large Load Diff

72
dist/web3.js.map vendored

File diff suppressed because one or more lines are too long

8
dist/web3.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -160,6 +160,13 @@ var getTransactionCount = new Method({
outputFormatter: utils.toDecimal outputFormatter: utils.toDecimal
}); });
var sendRawTransaction = new Method({
name: 'sendRawTransaction',
call: 'eth_sendRawTransaction',
params: 1,
inputFormatter: []
});
var sendTransaction = new Method({ var sendTransaction = new Method({
name: 'sendTransaction', name: 'sendTransaction',
call: 'eth_sendTransaction', call: 'eth_sendTransaction',
@ -226,6 +233,7 @@ var methods = [
getTransactionCount, getTransactionCount,
call, call,
estimateGas, estimateGas,
sendRawTransaction,
sendTransaction, sendTransaction,
compileSolidity, compileSolidity,
compileLLL, compileLLL,