roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity
13,882 Commits 2 Branches 1 Tag 247 MiB
e04d63ebd3
Commit Graph

878 Commits

Author SHA1 Message Date
Bas van Kervel
6d596b1ad1 fixed eth sign unittest 2015-06-22 13:19:59 +02:00
Bas van Kervel
2e0b56a72b added RPC start/stop support 2015-06-22 12:47:32 +02:00
Bas van Kervel
2737baa657 fixed unittests 2015-06-22 09:17:09 +02:00
Bas van Kervel
f87501b1c5 added batch support to console and attach actions 2015-06-22 09:17:09 +02:00
Bas van Kervel
3ff272b618 moved solidity test to new rpc structure 2015-06-22 09:17:09 +02:00
Bas van Kervel
ce5c94e471 added attach over http/rpc support 2015-06-22 09:17:09 +02:00
Bas van Kervel
f202563777 added attach over ipc command 2015-06-22 09:17:09 +02:00
Bas van Kervel
603192cfa7 cleanup comments/code 2015-06-22 09:17:09 +02:00
Bas van Kervel
a4a4e9fcf8 removed old rpc structure and added new inproc api client 2015-06-22 09:17:09 +02:00
Bas van Kervel
3e1d635f8d fixed rpc test failure in eth.blockNumber 2015-06-22 08:54:21 +02:00
Bas van Kervel
9ac1b4e59e fixed rpc test failure in net_peerCount 2015-06-22 08:54:21 +02:00
Bas van Kervel
5fdf72b1ab fixed web3 rpc test failures 2015-06-22 08:54:21 +02:00
Bas van Kervel
c3f6c322c0 added DB api 2015-06-22 08:54:21 +02:00
Bas van Kervel
5c25403b13 refactored old rpc structure to new 2015-06-22 08:54:21 +02:00
Bas van Kervel
fd764d4ff7 added comms http 2015-06-22 08:54:21 +02:00
Bas van Kervel
60c2ccd99c made ipc handler generic and reusable 2015-06-22 08:54:21 +02:00
Jeffrey Wilcke
0fa2750fc9 Merge pull request #1290 from tgerring/dataargs 
unit test coverage for NewDataArgs
 2015-06-19 07:44:39 -07:00
Jeffrey Wilcke
e4f9ec886b Merge pull request #1267 from SilentCicero/develop 
eth_sendRawTransaction JSON RPC
 2015-06-18 11:33:50 -07:00
Taylor Gerring
5afebc2a4b unit test coverage for NewDataArgs 2015-06-17 18:07:45 +02:00
SilentCicero
7ec8c257ff New DataArgs and eth_sendRawTransaction 2015-06-16 12:28:10 -04:00
Nick Dodson
e952bb65e7 thanks subtly :) 2015-06-16 00:06:28 -04:00
Nick Dodson
2642e091e9 NewSigArgs arg change. 2015-06-15 16:01:01 -04:00
Jeffrey Wilcke
cc0b451119 Merge pull request #1260 from obscuren/tx-drop-low-tx 
core: drop low gas tx
 2015-06-15 09:09:44 -07:00
obscuren
2628103f1d rpc/api: fixed default gas-(price) issue. 2015-06-15 17:21:08 +02:00
Nick Dodson
ad56aef5d2 Update utils.go 2015-06-15 11:10:40 -04:00
Nick Dodson
c3b80123e3 Update eth.go 2015-06-15 11:10:24 -04:00
Nick Dodson
f9f9352ceb Change eth_pushTx case to eth_sendRawTransaction 2015-06-15 10:50:07 -04:00
SilentCicero
d6233c7d2d Changed variable names 2015-06-15 10:07:32 -04:00
zsfelfoldi
b42b70eb5f fixed rpc/api.GasPrice 2015-06-15 15:55:39 +02:00
zsfelfoldi
3f94d09c1f fixed saving receipts 2015-06-15 15:55:38 +02:00
SilentCicero
f9a0a13fa9 eth_pushTx send raw signed encoded TX data to the chain through RPC 2015-06-14 18:07:03 -04:00
Bas van Kervel
b3c07f167f fixed incomplete merge action 2015-06-11 15:06:12 +02:00
Bas van Kervel
ec6a7b35f6 removed obsolete print statement 2015-06-11 15:00:33 +02:00
Bas van Kervel
7584e68c21 upgrade web3.js with _extend support 2015-06-11 14:43:05 +02:00
Bas van Kervel
1fe617fa57 added net API 2015-06-11 14:40:38 +02:00
Bas van Kervel
87dace1fa9 added miner API 2015-06-11 14:20:50 +02:00
Bas van Kervel
3c93034a32 fixed windows build problem 2015-06-11 14:18:08 +02:00
Bas van Kervel
594a34a88d changed send methods for backwards compatability in geth console 2015-06-11 14:17:28 +02:00
Bas van Kervel
1b59f89095 added console command 2015-06-11 14:17:27 +02:00
Bas van Kervel
bbfa0a3dcb added API/IPC commandline flags 2015-06-11 14:15:33 +02:00
Bas van Kervel
348f1562e2 restructured eth rpc API 2015-06-11 14:13:57 +02:00
Bas van Kervel
7e41d7ac51 added shh API 2015-06-11 14:01:41 +02:00
Bas van Kervel
bd38428f33 cleanup of javascript API 2015-06-11 14:01:41 +02:00
Bas van Kervel
87b62f75a7 added txpool API 2015-06-11 14:01:41 +02:00
Bas van Kervel
5f8e5a4875 upgrade web3.js with _extend support 2015-06-11 14:01:41 +02:00
Bas van Kervel
cc9ae39933 added admin API 2015-06-11 14:01:41 +02:00
Bas van Kervel
08d72a9245 added personal API 2015-06-11 14:01:41 +02:00
Bas van Kervel
09d0d55fc5 added debug API 2015-06-11 14:01:41 +02:00
Bas van Kervel
d2a87f6f72 added net API 2015-06-11 14:01:40 +02:00
Bas van Kervel
4b9b633dfe added miner API 2015-06-11 14:01:40 +02:00
Bas van Kervel
8aea85e374 fixed windows build problem 2015-06-11 14:01:39 +02:00
Bas van Kervel
862117e4bd changed send methods for backwards compatability in geth console 2015-06-11 14:01:39 +02:00
Bas van Kervel
a1a475fb92 added console command 2015-06-11 14:01:39 +02:00
Bas van Kervel
2a0d888326 added API/IPC commandline flags 2015-06-11 14:01:39 +02:00
Bas van Kervel
8ebf2d8fad added RPC/IPC support 2015-06-11 14:01:39 +02:00
Bas van Kervel
2f55a1d798 restructured eth rpc API 2015-06-11 14:01:39 +02:00
Taylor Gerring
2e0694b606 Updated test 2015-06-10 12:35:35 -04:00
obscuren
14994fa21b rpc: skip test if solc version doesn't match 2015-06-09 21:02:24 +02:00
Jeffrey Wilcke
60b780c21b Merge pull request #1217 from tgerring/rpcsign 
Fix RPC sign
 2015-06-09 06:19:39 -07:00
Taylor Gerring
046411866b Fixed signing + tests 2015-06-09 08:47:20 -04:00
Taylor Gerring
1a96798642 gas -> gasprice 2015-06-09 08:13:26 -04:00
Taylor Gerring
1c364b6beb gas -> gasprice 2015-06-09 08:13:25 -04:00
Taylor Gerring
c8a9a4e76d Differentiate between 0 and unspecified gas/gasprice 2015-06-09 08:13:25 -04:00
Felix Lange
e221a449e0 cmd/geth, jsre, rpc: run all JS code on the event loop 
Some JSRE methods (PrettyPrint, ToVal) bypassed the event loop. All
calls to the JS VM are now wrapped. In order to make this somewhat more
foolproof, the otto VM is now a local variable inside the event loop.
 2015-05-25 02:27:37 +02:00
obscuren
7381be8edb core/vm, rpc: added disasm to ext_ RPC 2015-05-22 15:38:46 +02:00
obscuren
6539ccae7c core: added RPC sign back in 2015-05-22 13:00:04 +02:00
zelig
e1d1417729 rpc: NewNotAvailableError instead of NewNotImplementedError if no solc 2015-05-20 05:29:28 +01:00
zelig
00f59f5014 fix eth.sign. now implemented in admin jsre until web3.js has it . 2015-05-20 04:38:20 +01:00
zelig
b0ae84aa0d multiple contract source for solidity compiler: returns contract array if multiple contracts. fixes #1023 2015-05-20 04:11:48 +01:00
zelig
f9abcee0f9 fix solc tests unskip 2015-05-20 02:47:13 +01:00
Jeffrey Wilcke
9b825e2728 Merge pull request #1036 from tgerring/issue884 
JSON RPC null field updates
 2015-05-19 06:44:31 -07:00
Taylor Gerring
748263d2f0 Use bytes.Repeat() instead of 32-byte literal 2015-05-19 08:14:48 -05:00
Taylor Gerring
a2598e649d Permit multiple CORS domains 
Separated by spaces
 2015-05-18 10:31:03 -05:00
Taylor Gerring
62d76b8e1f Cleanup 2015-05-18 10:11:27 -05:00
Taylor Gerring
a528bd04db Return nil for certain fields on eth_getTransactionByHash when not part of a block 2015-05-18 10:09:00 -05:00
Taylor Gerring
d381d9a74c Return nil for certain fields on eth_getBlockByNumber pending 2015-05-18 09:16:10 -05:00
Jeffrey Wilcke
158efbaa45 Merge pull request #984 from tgerring/issue924 
Omit replies for RPC notification requests
 2015-05-15 04:12:40 -07:00
Taylor Gerring
44a7f997c3 Unreverse ordering 2015-05-14 15:50:39 -05:00
Taylor Gerring
5c6540452a Omit replies for notification requests 
When Id is missing, the client does not want a response
 2015-05-14 12:39:57 -05:00
Taylor Gerring
4ad8f1035b Format contract code as hexdata 2015-05-14 12:17:19 -05:00
Gustav Simonsson
037772fc07 fix hex conversion bug in RPC for byte slices 2015-05-12 17:22:17 +02:00
obscuren
dca290d525 sol: skipped source checking step 2015-05-12 16:19:14 +02:00
obscuren
260536a729 rpc: hexData => hexNum 2015-05-12 15:02:44 +02:00
obscuren
66de3f0aa8 xeth, rpc: implement eth_estimateGas. Closes #930 2015-05-12 14:21:43 +02:00
obscuren
21e52efdfe cmd/geth, miner, backend, xeth: Fixed miner threads to be settable 
Miner threads are now settable through the admin interface (closes #897)
and specify 0 CPU worker threads when eth_getWork is called (closes #916)
 2015-05-11 17:21:22 +02:00
Daniel A. Nagy
a9e1d38612 Merge branch 'develop' of github.com:ethereum/go-ethereum into develop 
Conflicts:
	rpc/jeth.go
 2015-05-11 12:47:14 +02:00
obscuren
df323cdb4e rpc: display error message to stdout 2015-05-11 11:39:33 +02:00
Péter Szilágyi
0ad5898c0f rpc, xeth: fix #881, gracefully handle offline whisper 2015-05-11 11:53:53 +03:00
Daniel A. Nagy
3a01e3e39b Signing (almost) works. 2015-05-08 17:52:44 +02:00
Daniel A. Nagy
a487396b76 eth_sign added to API for signing arbitrary data. 2015-05-08 16:36:13 +02:00
Daniel A. Nagy
e94aa421c6 New API call for signatures. 2015-05-08 16:17:19 +02:00
Jeffrey Wilcke
45c070fc8b Merge pull request #833 from ethersphere/frontier/solidity 
solidity compiler and contract metadocs integration
 2015-05-08 03:43:31 -07:00
obscuren
b3c9b66f29 rpc: eth_transactionFilter => eth_newPendingTransactionFilter 2015-05-07 14:44:32 +02:00
obscuren
7e160a677d xeth, core, event/filter, rpc: new block and transaction filters 2015-05-07 14:44:32 +02:00
zelig
009b221692 solidity compiler and contract metadocs integration 
* common/compiler: solidity compiler + tests
* rpc: eth_compilers, eth_compileSolidity + tests
* fix natspec test using keystore API, notice exp dynamically changes addr, cleanup
* resolver implements registrars and needs to create reg contract (temp)
* xeth: solidity compiler. expose getter Solc() and paths setter SetSolc(solcPath)
* ethereumApi: implement compiler related RPC calls using XEth - json struct tests
* admin: make use of XEth.SetSolc to allow runtime setting of compiler paths
* cli: command line flags solc to set custom solc bin path
* js admin api with new features debug and contractInfo modules
* wiki is the doc https://github.com/ethereum/go-ethereum/wiki/Contracts-and-Transactions
 2015-05-07 12:58:21 +02:00
obscuren
03bb88dec0 xeth, rpc: added nonce setting through RPC and xeth transact 2015-05-06 18:30:55 +02:00
zsfelfoldi
c54d123b31 setTimeout and sendAsync implemented 
added and eval queue for serializing JSRE vm execution
 2015-05-06 15:58:27 +02:00
obscuren
99027c79fe Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 
Conflicts:
	rpc/api.go
 2015-04-28 11:17:41 +02:00
obscuren
459d898705 eth, rpc, xeth: ext_hanhrate => eth_hashrate 2015-04-28 11:16:03 +02:00
obscuren
46f63ef04f Merge branch 'develop' of https://github.com/kobigurk/go-ethereum into kobigurk-develop 2015-04-28 11:10:44 +02:00
Péter Szilágyi
978ffd3097 rpc, xeth: finish cleaning up xeth 2015-04-28 10:49:05 +03:00
Péter Szilágyi
e252dae499 rpc: use nil topic wildcards instead of "" 2015-04-28 10:49:04 +03:00
Péter Szilágyi
ae4bfc3cfb rpc, ui/qt/qwhisper, whisper, xeth: introduce complex topic filters 2015-04-28 10:49:04 +03:00
Péter Szilágyi
7948cc0029 rpc, whisper, xeth: fix RPC message retrieval data race 2015-04-28 10:47:35 +03:00
Péter Szilágyi
3563c59b12 rpc, whisper, xeth: polish whisper RPC interface 2015-04-28 10:47:35 +03:00
Taylor Gerring
3ad5243b18 Return Gas Price not Gas 
And output as quantity, not data
 2015-04-27 13:58:32 -05:00
Taylor Gerring
b071e7f4db Remove old logger from RPC pkg 2015-04-27 09:18:55 -05:00
Jeffrey Wilcke
67cc80ba66 Merge pull request #786 from tgerring/issue739 
Empty Call response should return 0x instead of 0x00. Closes #739
 2015-04-23 02:22:35 -07:00
Jeffrey Wilcke
359a9773a1 Merge pull request #783 from tgerring/issue777 
Issue 777
 2015-04-23 02:11:20 -07:00
Taylor Gerring
73b3f2837f Handle bug in parent call response 2015-04-22 14:14:10 -05:00
Taylor Gerring
41e3d01e63 Rename eth_Version to eth_protocolVersion. Closes #737 2015-04-22 13:42:09 -05:00
Taylor Gerring
20bae2b8f6 Tests for magic words 2015-04-22 13:24:29 -05:00
Taylor Gerring
2ea2261156 Accept num or hex as index 2015-04-22 13:24:10 -05:00
Taylor Gerring
35ad9febce Update eth_getBlockByNumber to accept words 2015-04-22 13:14:10 -05:00
Taylor Gerring
13dc8627b5 Treat hexnums as big.Int instead of int64 2015-04-21 08:48:57 -05:00
Kobi Gurkan
9e03c48d43 move eth_hashrate to ext 2015-04-21 16:44:08 +03:00
Kobi Gurkan
63c5c7fb2d uses newHexNum for eth_hashrate 2015-04-21 16:44:08 +03:00
Kobi Gurkan
41b83fe1cd adds eth_hashrate RPC method 2015-04-21 16:44:08 +03:00
obscuren
6c2b703c58 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2015-04-21 12:14:07 +02:00
obscuren
ed0817c55d core/rpc: fix for null entries in log filters. Closes #725 
You can now specify `null` as a way of saying "not interested in this
topic, match all". core.Filter assumes the zero'd address to be the
wildcard. JSON rpc assumes empty strings to be wildcards.
 2015-04-21 12:00:57 +02:00
Andy
3ef1cd43f6 fix for: Please remove the "minGasPrice" from block returns #754 2015-04-20 22:08:50 -06:00
Jeffrey Wilcke
99e825ad96 Merge pull request #734 from bas-vk/issue-729 
admin.StopRPC added to console
 2015-04-20 10:34:50 -07:00
zsfelfoldi
b635cad9fe NatSpec passing end to end test 2015-04-19 20:57:49 +01:00
zsfelfoldi
3136bae4a5 NatSpec, URL register storage retrieval 
fixed 2/3 tests
 2015-04-19 20:57:48 +01:00
Bas van Kervel
61885aa965 Don't export types/functions 2015-04-19 10:01:50 +02:00
Bas van Kervel
2c229bac00 Replaced channel pointer field with non pointer channel 2015-04-19 09:55:41 +02:00
obscuren
c39a7b5c0d Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2015-04-18 02:33:04 +02:00
obscuren
89fd752659 rpc: set from. Closes #742 2015-04-18 02:32:55 +02:00
Bas van Kervel
ead3dd9759 Stop accepted and alive connections (http keep-alive) when the rpc service is stopped 2015-04-16 19:23:57 +02:00
Bas van Kervel
57f93d25bd admin.stopRPC support added which stops the RPC HTTP listener 2015-04-16 12:56:51 +02:00
Taylor Gerring
6388767df0 Fix call output when empty 2015-04-15 12:45:20 -05:00
obscuren
d82aaf617c rpc: changed logging to use glog 2015-04-15 00:09:13 +02:00
obscuren
8db7b2374c rpc: change eth_protocolVersion to eth_version. Closes #714 2015-04-14 20:47:21 +02:00
obscuren
d61ec9ca76 rpc: removed hash from LogRes. Closes #701 2015-04-13 21:28:05 +02:00
obscuren
9f5d24be31 glog 2015-04-09 18:16:22 +02:00
obscuren
a9959805e5 Removed from as a requirement and changed 
Removed the from as a requiremet from the RPC eth_call. Xeth#Call now
also default values to:

1. Supplied account
2. First account if any
3. No managed account => 000000..00
 2015-04-09 00:44:20 +02:00
obscuren
a7750c929b Fixed tests to reflect log changes 2015-04-08 20:45:39 +02:00
obscuren
1c872ddf4b Changed how logs are being recorded 
Logs are now recorded per transactions instead of tossing them out after
each transaction. This should also fix an issue with
`eth_getFilterLogs` (#629) Also now implemented are the `transactionHash,
blockHash, transactionIndex, logIndex` on logs. Closes #654.
 2015-04-08 17:15:45 +02:00
obscuren
3063aad7db merge conflict 2015-04-07 15:04:29 +02:00
Taylor Gerring
d0c3f127ee More type fixes 2015-04-07 06:49:31 -05:00
obscuren
43454053b0 Fixed tests 2015-04-07 13:10:12 +02:00
Taylor Gerring
1aaeae292d Output format and nil fixes 2015-04-07 06:10:00 -05:00
Taylor Gerring
5c988c8ea0 Increased test coverage for args 2015-04-04 11:58:23 -05:00
Taylor Gerring
435378e953 Improved test coverage for rpc types 2015-04-04 15:09:30 +02:00
Taylor Gerring
71e62eb620 More test coverage for responses 2015-04-04 14:08:35 +02:00
Taylor Gerring
2b9b9e7704 Allow "earliest" block height 2015-04-04 13:25:47 +02:00
Jeffrey Wilcke
a6ca3d0261 Merge pull request #626 from tgerring/rpcfabian 
RPC Tests updates
 2015-04-03 11:58:18 +02:00
Taylor Gerring
3e042317ad Return nil if block does not exist 2015-04-02 20:37:51 +02:00
Taylor Gerring
1d74086b42 New UncleRes type 2015-04-02 17:55:42 +02:00
Taylor Gerring
537e2cfeb6 Return nil when requested uncle index is not valid 2015-04-02 16:12:19 +02:00
Taylor Gerring
e882ba0c29 Return nil when requested index does not exist 
Instead of error
 2015-04-02 16:11:00 +02:00
Taylor Gerring
aa71e27a3b Detect non-valid strings for blockheight 2015-04-02 15:53:04 +02:00
Taylor Gerring
3908590578 Make "To" field optional in whisper filter 2015-04-02 15:37:35 +02:00
Jeffrey Wilcke
607fc788e3 Merge pull request #619 from tgerring/rpcfabian 
RPC Fabian fixes
 2015-04-02 15:13:30 +02:00
Taylor Gerring
876ce0fb12 More nil checks 2015-04-02 14:54:28 +02:00
Taylor Gerring
172b34351a HashArgs fix + tests 2015-04-02 14:49:33 +02:00
Taylor Gerring
b9c9d6d798 Use HashArgs for eth_getTransactionByHash 2015-04-02 14:37:11 +02:00
Taylor Gerring
b4eef59b6f No longer require gas & gas price in transactions 
Defaults to 0, which is then set to default values in XEth
 2015-04-02 14:05:14 +02:00
obscuren
1e28b424e7 Default gas 2015-04-02 14:00:49 +02:00
Taylor Gerring
015453f5b3 Default Value to 0 for NewTxArgs 2015-04-02 13:55:53 +02:00
Taylor Gerring
118ad22ee5 Merge branch 'develop' into rpcfabian 2015-04-02 13:39:46 +02:00
Taylor Gerring
81de8ed091 Format code as hexdata 2015-04-02 13:38:12 +02:00
Taylor Gerring
b86450aaae Guard from nil pointers 2015-04-02 13:27:58 +02:00
Taylor Gerring
e402e1dc2e New args types with stricter checking 2015-04-02 13:17:55 +02:00
Taylor Gerring
14c14fd61f Output empty block as nil 2015-04-02 13:05:13 +02:00
Taylor Gerring
2efb89d544 Guard for nil *big.Int 2015-04-02 13:04:58 +02:00
obscuren
3f4c1aaf01 info => debug 2015-04-02 12:58:17 +02:00
obscuren
0f3bf7ef4d Fixes for balance 2015-04-02 12:57:04 +02:00
Taylor Gerring
585aec127c Don't ignore user-specified "include tx" param 2015-04-02 12:56:36 +02:00
Taylor Gerring
edfd2757d9 Better decoding of uint* 2015-04-02 12:52:25 +02:00
Taylor Gerring
b10e33c040 More types supported 2015-04-02 12:31:10 +02:00
Taylor Gerring
cc45b4d8b5 Trim left only, not right 2015-04-02 12:30:42 +02:00
Taylor Gerring
f89baa73e5 transactionRoot -> transactionsRoot 2015-04-02 12:30:22 +02:00
Taylor Gerring
85ebbc9aa5 Default BlockNumber to -1 when missing 2015-04-02 11:57:26 +02:00
Taylor Gerring
c71ca1a089 Better nil handling 2015-04-02 11:32:50 +02:00
obscuren
4391c38215 Changed getters on account objects. Closes #610 
* GetCode
* GetNonce
* GetStorage
* GetBalance
 2015-04-01 23:22:16 +02:00
Taylor Gerring
5d8be9c30d Fixed decoding for uint64 into bytes 2015-04-01 23:08:00 +02:00
Taylor Gerring
eac4d582d7 Patches 2015-04-01 17:49:22 +02:00
Taylor Gerring
1045015a3c Update nonce field 2015-04-01 17:48:53 +02:00
Taylor Gerring
b6f0b40037 Respect fullTx option #614 2015-04-01 16:49:07 +02:00
Taylor Gerring
55b9689950 rename messages to types 2015-04-01 15:53:48 +02:00
Taylor Gerring
bea3879d6f If nil, type doesn't matter 2015-04-01 15:45:56 +02:00
Taylor Gerring
ac03ff6f05 Fix block size output #613 2015-04-01 15:44:09 +02:00
Taylor Gerring
6e8ff578f1 Block nonce as data 2015-04-01 15:28:06 +02:00
Taylor Gerring
93f832a1a7 Make block context optional nulls 2015-04-01 15:27:37 +02:00
Taylor Gerring
0ce971d9d3 Add new formatting regex 2015-04-01 15:27:14 +02:00
Taylor Gerring
dbf17105f6 Build transaction context in BlockRes 2015-04-01 13:18:51 +02:00
Taylor Gerring
88f2a96ca3 Set fullTx option in constructor 2015-04-01 13:18:30 +02:00
obscuren
b0e09ec827 merge conflict 2015-04-01 12:51:39 +02:00
Taylor Gerring
02fb83782e #612 rename eth_protocol method 2015-04-01 12:28:48 +02:00
Taylor Gerring
b860b67693 Remove extra type assetion 2015-04-01 11:45:29 +02:00
Taylor Gerring
7b7392826d Improved response tests 
Actually verifies output as by regex
 2015-04-01 11:38:06 +02:00
Taylor Gerring
25998cfc45 Re-enabled response tests (needs improvement) 2015-04-01 09:11:23 +02:00
Taylor Gerring
bbca6250ff Merge branch 'rpccall' into hexify 2015-03-31 22:40:52 +02:00
Taylor Gerring
40ea466200 Store and retrieve tx context metadata #608 
Improving this in the future will allow for cleaning up a bit of legacy
code.
 2015-03-31 22:40:12 +02:00
Taylor Gerring
7e3875b527 Remove custom MarshalJSON methods 
Now formats based on underlying hexdata or hexnum type. Fields directly
with respective constructors that cover from native types
 2015-03-31 19:04:02 +02:00
Taylor Gerring
a2501ecfcd Make new types Stringers 2015-03-31 19:02:46 +02:00
Taylor Gerring
8f0e095f4c Index is zero-based #607 2015-03-31 17:56:06 +02:00
Taylor Gerring
81aeb78976 Update output types to use hexnum or hexdata 
Benefits from automatic output formatting differences between
quantities and data
 2015-03-31 17:40:35 +02:00
Taylor Gerring
3a948b2dba Add hexdata and hexnum types 2015-03-31 17:39:58 +02:00
Taylor Gerring
2f3a968136 New CallArgs 
Requirements for calls differ from transactions
 2015-03-30 16:20:30 +02:00
Taylor Gerring
b6fde73ef1 Add settable domain to CORS handler #331 2015-03-29 21:56:04 +02:00
Taylor Gerring
04a7c4ae1e Abstract http into rpc package 
New RpcConfig object to pass growing config
 2015-03-29 21:26:47 +02:00
Taylor Gerring
391d79ef44 Add ExtraData field to RPC output 2015-03-29 12:08:52 +02:00
Taylor Gerring
129fabddb2 Prefer hex prefixed with 0x 2015-03-28 21:47:16 +01:00
Taylor Gerring
d9f8b1e0c1 Report InvalidTypeError as -32602 to JSON RPC 2015-03-28 21:42:44 +01:00
Taylor Gerring
e80ef9ff34 Cleanup 2015-03-28 21:41:34 +01:00
Taylor Gerring
29930da522 eth_getStorageAt output hex should begin with 0x 2015-03-28 21:27:50 +01:00
Taylor Gerring
779a51c047 Merge branch 'develop' of https://github.com/kobigurk/go-ethereum into kobigurk-develop 
Conflicts:
	rpc/api.go
 2015-03-28 21:05:32 +01:00
Kobi Gurkan
47af2f02cb eth_getTransactionCount now returns a hex string 2015-03-27 22:22:13 +03:00
Taylor Gerring
43d521e90e Decouple core from rpc 2015-03-27 16:36:01 +01:00
Taylor Gerring
0ac346f707 Merge branch 'develop' into rpcargs 2015-03-27 16:03:49 +01:00
Taylor Gerring
9f84c78eb5 BlockFilterArgs 2015-03-27 15:54:54 +01:00
Jeffrey Wilcke
54a14d5c9d Merge pull request #584 from tgerring/issue577 
Use ExtraDB for RPC storage. Fixes #577
 2015-03-27 11:48:03 +01:00
Jeffrey Wilcke
09280c5f11 Merge pull request #565 from tgerring/responsetypes 
Update response types + tests
 2015-03-27 11:44:13 +01:00
Taylor Gerring
e29396b691 Use ExtraDB for storage. Fixes #577 2015-03-27 09:36:18 +01:00
Taylor Gerring
c38630af23 Test blockHeightFromJsonInvalid 2015-03-27 00:13:03 +01:00
Taylor Gerring
e0781c2548 NewTxArgs accept numbers or strings for value/gas/gasprice 2015-03-27 00:07:28 +01:00
Taylor Gerring
3fcef54f9b tidy 2015-03-26 22:58:12 +01:00
Taylor Gerring
6bd1f6cc49 Merge remote-tracking branch 'origin' into rpcargs 
Conflicts:
	rpc/args.go
 2015-03-26 22:42:46 +01:00
Taylor Gerring
bb12dbe233 Prefer args as strings not objects 2015-03-26 22:35:42 +01:00
Taylor Gerring
7eed7e1d96 Merge branch 'rpcargs' of github.com:tgerring/go-ethereum into rpcargs 2015-03-26 22:27:06 +01:00
Taylor Gerring
2c5a32ebbc Undo XEth changes 2015-03-26 22:24:48 +01:00
Taylor Gerring
49a912ce33 Undo xeth changes 2015-03-26 22:14:31 +01:00
Taylor Gerring
1f3814141b WhisperMessageArgs 2015-03-26 21:07:50 +01:00
Taylor Gerring
9ca87afd0b WhisperFilterArgs 2015-03-26 20:52:09 +01:00
Taylor Gerring
81f36df910 CompileArgs 2015-03-26 20:31:00 +01:00
Taylor Gerring
ddcc8e1673 SubmitWorkArgs tests 2015-03-26 20:25:30 +01:00
Taylor Gerring
b414a1303f WhisperIdentityArgs 2015-03-26 20:20:43 +01:00
Taylor Gerring
1f1e98f96b FilterIdArgs 2015-03-26 20:10:31 +01:00
Taylor Gerring
62ebf999bf FilterStringArgs tests 2015-03-26 20:04:03 +01:00
Taylor Gerring
e21ce9a9b4 DbHexArgs tests 2015-03-26 19:39:40 +01:00
Taylor Gerring
f68ca2b6e6 DbArgs tests 2015-03-26 19:34:32 +01:00
Taylor Gerring
3ab9f26943 Accept number or string for BlockFilterArgs limit/offset 2015-03-26 19:17:25 +01:00
Taylor Gerring
6661bc35ef Accept number or string for BlockFilterArgs to/fromBlock 2015-03-26 17:27:29 +01:00
Taylor Gerring
745dd5b7a5 Sha3Args 2015-03-26 16:19:33 +01:00
Taylor Gerring
f695d01354 Convert error checks to Expect functions 2015-03-26 16:16:17 +01:00
Taylor Gerring
3472823be9 HashIndexArgs 2015-03-26 14:17:32 +01:00
Taylor Gerring
cb103c089a BlockNumIndexArgs 2015-03-26 13:57:41 +01:00
Taylor Gerring
cd6b3fd28a GetDataArgs 2015-03-26 13:50:22 +01:00
Taylor Gerring
a49c81547c DecodeParamError -> InvalidTypeError for unexpected input type 2015-03-26 13:45:06 +01:00
Taylor Gerring
ca03e97697 Add InvalidTypeError 2015-03-26 13:33:44 +01:00
Taylor Gerring
c139af5826 GetBalanceArgs 2015-03-26 13:10:31 +01:00
Taylor Gerring
4523a00b91 GetTxCountArgs 2015-03-26 12:47:00 +01:00
obscuren
c33dc3e328 moved helper 2015-03-26 12:40:09 +01:00
obscuren
83b0cad766 fixed block filter args 2015-03-26 12:34:59 +01:00
obscuren
b8a667deed debug log 2015-03-26 12:15:25 +01:00
obscuren
4ba850639e updated web3.js light for console 2015-03-26 12:15:12 +01:00
Taylor Gerring
9c4504dc41 GetStorageAtArgs 2015-03-26 12:11:28 +01:00
obscuren
eb433731aa Fixed filter and refactored code 2015-03-26 12:06:14 +01:00
Taylor Gerring
300d36b864 improved NewTxArgs tests 2015-03-26 11:59:35 +01:00
Taylor Gerring
ad2089b0a3 Add blockHeightFromJson convenience function 2015-03-26 11:59:16 +01:00
Taylor Gerring
493e0d7be8 improved GetBlockByNumber tests 2015-03-26 11:07:14 +01:00
Taylor Gerring
93af30a6f6 improved GetBlockByHashArgs tests 2015-03-26 11:06:45 +01:00
Taylor Gerring
bd1a54f076 GetStorageArgs 2015-03-26 10:52:32 +01:00
Taylor Gerring
966cfa4bdd NewTxArgs 2015-03-26 10:34:21 +01:00
Taylor Gerring
c7dc379da5 GetBlockByHashArgs 2015-03-26 10:14:52 +01:00
Taylor Gerring
e22bcb78a5 Update response types + tests 
To coincide with recent type conversion
 2015-03-25 16:50:30 +01:00
Jeffrey Wilcke
aa1eae67ec Merge pull request #560 from tgerring/xethcleanup 
XEth cleanup
 2015-03-25 13:55:46 +01:00
Taylor Gerring
2b93843d86 Improve protocol version reporting 2015-03-25 12:09:55 +01:00
obscuren
3301f6ecef back to debug log 2015-03-24 23:55:48 +01:00
obscuren
97bf9f1521 Temp fix for console output 2015-03-24 23:50:27 +01:00
obscuren
c38a3b4cc7 Better error reporting in the console. Updated ethereum.js 2015-03-24 17:49:28 +01:00
Taylor Gerring
59b6b619a2 Don't expose backend directly 2015-03-24 16:33:37 +01:00
Taylor Gerring
e954c24af0 Implement RPC net_version 2015-03-23 18:06:05 +01:00
Taylor Gerring
1cf6ca8f10 Add Close() method to EthereumApi 
To close the handler for LDB
 2015-03-23 17:41:50 +01:00
Taylor Gerring
1e61b75cbf tests + fixes 2015-03-23 17:33:01 +01:00
obscuren
0330077d76 moved state and vm to core 2015-03-23 16:59:09 +01:00
Taylor Gerring
5707912e2f "pending" convention should be -2 instead of 0 2015-03-23 16:36:12 +01:00
Taylor Gerring
2f8601ef38 Rename blockAge to blockHeight 2015-03-23 16:34:50 +01:00
Taylor Gerring
3f6e1b2fd3 db_putHex/db_getHex + tests 2015-03-23 16:04:21 +01:00
Taylor Gerring
0846e15667 go away! 2015-03-23 09:36:28 +01:00
Taylor Gerring
ab6311c1bd Move remote mining agent to XEth 2015-03-23 09:35:42 +01:00
Taylor Gerring
d76e8cb1f1 Consistent var names 2015-03-23 09:24:52 +01:00
Taylor Gerring
16a58f8f2a Always return 3 strings 2015-03-23 08:55:06 +01:00
Taylor Gerring
31879eca8c Stub corrected getWork response 2015-03-23 08:45:09 +01:00
Taylor Gerring
3772f02569 Rename for filename typo 2015-03-23 08:29:41 +01:00
Taylor Gerring
372e1cad5b Cleanup get/submitWork 
getWork needs to return additional values
 2015-03-23 08:28:54 +01:00
Jeffrey Wilcke
3133372a6a Merge pull request #536 from zsfelfoldi/develop 
using robertkrimen/otto, godeps updated
 2015-03-22 21:45:56 +01:00
obscuren
8ed4f226d1 check for nil ptrs 2015-03-22 15:44:00 +01:00
obscuren
82956df523 Get work / submit work partially implemented. 
* WIP missing arguments for submitting new work
* GetWork **done**
 2015-03-22 15:38:01 +01:00
obscuren
83728e4b64 Merge branch 'develop' into conversion 
Conflicts:
	rpc/responses.go
 2015-03-21 14:54:25 +01:00
Taylor Gerring
670021da15 Rename topic to topics #544 2015-03-21 07:08:33 +01:00
obscuren
54dac59285 wip 2015-03-20 17:42:09 +01:00
obscuren
a59bb053f4 merge 2015-03-20 16:02:01 +01:00
Taylor Gerring
28e1971272 Merge branch 'rpcxeth' into rpcfrontier 
Conflicts:
	rpc/api.go
 2015-03-20 15:25:43 +01:00
Taylor Gerring
0cde7a4d46 Add xethAtStateNum convenience method 2015-03-20 14:56:55 +01:00
Taylor Gerring
efcc93e7da Move Account register to xeth 2015-03-20 14:12:07 +01:00
Taylor Gerring
739c36ad4d inline GetStorageAt 2015-03-20 13:45:07 +01:00
Taylor Gerring
28e5fc8352 Make pretty 2015-03-20 13:37:56 +01:00
zsfelfoldi
8324b683b4 using robertkrimen/otto, godeps updated 2015-03-20 13:22:01 +01:00
obscuren
41c493ace9 Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rpcfrontier 2015-03-20 12:07:19 +01:00
obscuren
55fdf3e462 Listen to tx pre event and trigger 'pending' 2015-03-20 12:07:06 +01:00
Taylor Gerring
b3329bc698 inline Transact 2015-03-20 07:15:34 +01:00
Taylor Gerring
aa3918efa7 Move transact gas check to XEth 2015-03-20 07:13:29 +01:00
Taylor Gerring
e038a42d7a inline Call 2015-03-20 06:58:53 +01:00
Taylor Gerring
1d6451f5c3 inline GetBlockByNumber 2015-03-20 06:57:23 +01:00
Taylor Gerring
bde161382a inline GetBlockByHash 2015-03-20 06:53:24 +01:00
Taylor Gerring
eb45211501 Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier 2015-03-20 06:45:44 +01:00
Taylor Gerring
b56e20be27 Reorg for clarity 2015-03-20 00:24:23 -04:00
Taylor Gerring
754160afea Move gas defaults to XEth 2015-03-20 00:23:48 -04:00
Taylor Gerring
c3a3d38735 Add tests for errors 2015-03-20 00:08:29 -04:00
Taylor Gerring
3cea7d87c1 Rename FilterOptions to BlockFilterArgs 2015-03-19 23:55:17 -04:00
Taylor Gerring
d791fe4975 Remove unnecessary event mux 2015-03-19 23:34:35 -04:00
Taylor Gerring
19360c0079 Move stateAt func to XEth 2015-03-19 23:28:45 -04:00
Taylor Gerring
6669ef5b70 Rename for clarity 2015-03-19 23:20:54 -04:00
Taylor Gerring
7b45f3377f inline MessagesChanged 2015-03-19 23:14:55 -04:00
Taylor Gerring
2ef2b9f2e0 inline UninstallWhisperFilter 2015-03-19 23:13:52 -04:00
Taylor Gerring
1f9b93647b inline NewWhisperFilter 2015-03-19 23:11:52 -04:00
Taylor Gerring
4b5e592656 inline AllLogs 2015-03-19 23:10:23 -04:00
Taylor Gerring
0bda63eb76 inline Logs 2015-03-19 23:08:26 -04:00
Taylor Gerring
d2e7414230 inline FilterChanged 2015-03-19 23:07:25 -04:00
Taylor Gerring
3e9632e256 inline NewFilterString 2015-03-19 23:06:32 -04:00
Taylor Gerring
84b19971fa inline UninstallFilter 2015-03-19 23:05:23 -04:00
Taylor Gerring
4663a55f12 inline NewFilter 2015-03-19 23:03:53 -04:00
Taylor Gerring
7c30716828 Merge branch 'rpcinline' into rpcxeth 
Conflicts:
	rpc/api.go
 2015-03-19 23:01:10 -04:00
Taylor Gerring
6c04c19eb4 Reorg filter logic to XEth 2015-03-19 22:58:07 -04:00
Taylor Gerring
12d87226a7 Merge branch 'rpcutil' into rpcfrontier 2015-03-19 20:52:36 -04:00
Taylor Gerring
cdfc03dc8e inline WhisperPost 2015-03-19 20:40:50 -04:00
Taylor Gerring
0895190b64 inline GetBlockTransactionCountByHash 2015-03-19 20:31:40 -04:00
Taylor Gerring
ff657edbb6 inline GetBlockTransactionCountByNumber 2015-03-19 20:30:42 -04:00
Taylor Gerring
c57eb286d6 inline GetBlockUncleCountByHash 2015-03-19 20:29:46 -04:00
Taylor Gerring
216175c265 inline GetBlockUncleCountByNumber 2015-03-19 20:28:25 -04:00
Taylor Gerring
7e6c8a411d fixes 2015-03-19 20:26:09 -04:00
Taylor Gerring
22546dcb55 inline UninstallWhisperFilter 2015-03-19 20:14:27 -04:00
Taylor Gerring
b28e6d8306 inline WhisperMessages 2015-03-19 20:12:52 -04:00
Taylor Gerring
cc91ba0add inline GetTransactionByHash 2015-03-19 20:12:12 -04:00
Taylor Gerring
0eb9572d64 inline RemoveWhisperIdentity 2015-03-19 20:10:05 -04:00
Taylor Gerring
85e03217de inline NewWhisperIdentity 2015-03-19 20:09:54 -04:00
Taylor Gerring
57f6a3b5c0 inline DbGet 2015-03-19 20:06:35 -04:00
Taylor Gerring
6fef616870 inline DbPut 2015-03-19 20:05:48 -04:00
Taylor Gerring
d28cd0f040 inline GetCompilers 2015-03-19 20:04:40 -04:00
Taylor Gerring
152b37ee11 inline GetData 2015-03-19 20:04:02 -04:00
Taylor Gerring
e530c960a4 inline GetTxCountAt 2015-03-19 20:03:27 -04:00
Taylor Gerring
3aea645106 inline GetStorage 2015-03-19 20:02:31 -04:00
Taylor Gerring
7562bc1dbc inline GetBalance 2015-03-19 20:00:41 -04:00
Taylor Gerring
b7745c6835 inline HasWhisperIdentity 2015-03-19 20:00:18 -04:00
Taylor Gerring
6cc02aadbf Inline getStateWithNum 2015-03-19 19:58:59 -04:00
Taylor Gerring
abc3d8d50a Make send internal 2015-03-19 18:06:26 -04:00
obscuren
013427bde2 Merge branch 'develop' into conversion 2015-03-19 21:18:29 +01:00
Taylor Gerring
c7b616ac14 Remove util 2015-03-19 14:28:31 -04:00
Taylor Gerring
1f2de6ecd5 Remove extra logger 2015-03-19 14:21:42 -04:00
Taylor Gerring
d670c861d7 Move Log to LogRes 2015-03-19 14:19:52 -04:00
obscuren
463491f8cd moved back to debug 2015-03-19 16:59:54 +01:00
obscuren
b5a71d955c merge 2015-03-19 16:59:13 +01:00
obscuren
14a2f42f37 fixed chain event. Closes #529 2015-03-19 16:19:54 +01:00
Taylor Gerring
8b20c3cc97 Validate NewTx From field is not blank 2015-03-18 20:30:09 -04:00
Taylor Gerring
0685810ec6 Tests 2015-03-18 15:48:40 -04:00
Taylor Gerring
e02eedb43e BlockNumber as int fix 2015-03-18 15:48:34 -04:00
Taylor Gerring
7cbcd81ddc Remove UnmarshalRawMessages 2015-03-18 15:42:57 -04:00
obscuren
5f35e6778f Merge branch 'rpcfrontier' into conversion 2015-03-18 18:42:30 +01:00
obscuren
f9a6038f5b merge 2015-03-18 18:23:37 +01:00
Taylor Gerring
60c43d1952 Remove i2hex 2015-03-18 11:10:08 -04:00
Taylor Gerring
7c9bc8517d Remove RpcServer 2015-03-18 11:08:49 -04:00
Taylor Gerring
e30c323391 merge develop 2015-03-18 08:46:55 -04:00
obscuren
0a1eeca41e conversions. -compilable- 2015-03-18 13:00:01 +01:00
Taylor Gerring
67c9d9c2fa Remove JsonWrapper 2015-03-17 20:14:19 -04:00
Taylor Gerring
c6f84325b1 Support JSON RPC batch requests 2015-03-17 17:46:22 -04:00
Taylor Gerring
8fd243ee23 Add JSON RPC batch support 
http://www.jsonrpc.org/specification#batch
 2015-03-17 17:38:05 -04:00
Jeffrey Wilcke
3ea99f989f Merge pull request #498 from maran/feature/drytoHex 
DRY up the use of toHex in the project and move it to common
 2015-03-17 21:31:42 +01:00
obscuren
917050dc30 Merge branch 'develop' into rpcfrontier 2015-03-17 21:27:34 +01:00
Taylor Gerring
fe819f3b9f Comment out whisper remove identity stubs 2015-03-17 09:11:01 -04:00
Taylor Gerring
176115e22e More empty param tests 2015-03-16 16:49:51 -04:00
Taylor Gerring
0339a13862 RPC empty args tests 2015-03-16 16:21:51 -04:00
Taylor Gerring
719effa7ec Return error when filter params are not strings 2015-03-16 15:30:31 -04:00
Taylor Gerring
03ac0f18ae Initial support to remove Whisper identities per #491 2015-03-16 14:46:46 -04:00
Maran
7330c97b5b DRY up the use of toHex in the project and move it to common 2015-03-16 16:56:11 +01:00
zelig
5e7702fd05 Merge remote-tracking branch 'upstream/develop' into frontier/js 
Conflicts:
	cmd/ethereum/js.go
	javascript/types.go
 2015-03-16 22:46:29 +07:00
Taylor Gerring
5757f547a6 Allow latest/pending in filter options 2015-03-16 10:38:57 -04:00
obscuren
b523441361 Moved ethutil => common 2015-03-16 11:27:38 +01:00
zelig
16ecb1e2ea rpc 
- camelcase fields dont play nice with otto value magic: JsonRpc -> Jsonrpc, ID -> Id
- jeth: ethereum.js rpc transport provider direct bridge between js and ethereumApi via otto jsre
 2015-03-15 13:21:54 +07:00
obscuren
12cee1377f Increased filter ticker time to 5 minutes 2015-03-14 18:57:12 +01:00
obscuren
35bc7b0d8a Merge branch 'rpcfrontier' into develop 2015-03-14 12:44:24 +01:00
Maran
991993357c DRY up the use of fromHex and put it in ethutil 2015-03-14 11:39:35 +01:00
Taylor Gerring
f49e17eb39 Return null coinbase when accounts not created 
Was previously returning nonsensical “0x”
 2015-03-13 14:32:11 -04:00
Taylor Gerring
e3b64d70c2 Rename db_put db_get 2015-03-13 10:56:41 -04:00
Taylor Gerring
d3f96dc720 Consolidate error type switch 2015-03-13 10:03:48 -04:00
Taylor Gerring
0932f84383 Fix eth_newBlockFilter 2015-03-13 10:03:19 -04:00
Taylor Gerring
d4ed66c83d Add web3_clientVersion 2015-03-12 19:20:46 -05:00
Taylor Gerring
094f921e50 Convert to proper errors 
Allow returning different JSON RPC error codes depending on error type
 2015-03-12 19:07:03 -05:00
Taylor Gerring
14bdcd2c05 Fix arg names in tests 2015-03-12 11:50:03 -05:00
obscuren
2273155e7e Get transaction implemented 
* Added a GetTransaction to XEth
* Implemented the `eth_getTransactionByHash` RPC method
 2015-03-12 15:59:07 +01:00
Taylor Gerring
4418e4ea6a Should on empty params #466 2015-03-12 08:42:31 -05:00
Taylor Gerring
21fca93852 Output filter ID as hex 2015-03-12 08:20:07 -05:00
Taylor Gerring
704914be08 Check for existance of key before delete 2015-03-12 00:01:18 -05:00
Taylor Gerring
70f6f2af07 shh_uninstallFilter 2015-03-11 15:49:21 -05:00
Taylor Gerring
c2181fdbf2 block&index args unmarshal plus test 2015-03-11 15:26:28 -05:00
obscuren
c01d4c2f4c Lowered default gas price and increased default gas limit 2015-03-11 17:36:35 +01:00
obscuren
2da7af4ba0 Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rpcfrontier 2015-03-11 17:00:30 +01:00
obscuren
e8d1b622d9 Default block number changes 2015-03-11 17:00:20 +01:00
Taylor Gerring
90f34ed40a Rename Topic to Topics 2015-03-11 10:56:44 -05:00
Taylor Gerring
9e89c803f1 Get Uncles 2015-03-11 10:27:32 -05:00
Taylor Gerring
53ac85cfd3 BlockHash must be a string 2015-03-11 10:27:24 -05:00
Taylor Gerring
d465e410ef TxIndex -> Index 2015-03-11 10:25:15 -05:00
Taylor Gerring
6bca40274f Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier 2015-03-10 22:25:32 -05:00
Taylor Gerring
9ce5229ddf Get transaction via block & index 2015-03-10 22:25:07 -05:00
Taylor Gerring
ece29c5d8d Nil check block 2015-03-10 19:34:07 -05:00
obscuren
64933321fb Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rpcfrontier 2015-03-11 01:10:58 +01:00
Taylor Gerring
499f816e30 Output hex should be prepended with 0x 2015-03-10 19:10:02 -05:00
obscuren
7e0ccc9de5 Merge branch 'develop' into rpcfrontier 
Conflicts:
	rpc/api.go
	rpc/args.go
 2015-03-11 01:08:42 +01:00