Commit Graph

361 Commits

Author SHA1 Message Date
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
Taylor Gerring fda4d02f94 Left-pad odd length hex inputs and tests 2015-03-10 18:08:31 -05:00
obscuren ce595b9266 fallback 2015-03-10 20:28:20 +01:00
obscuren 35841e5190 id to hex 2015-03-10 20:16:53 +01:00
obscuren d9f96293be Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rpcfrontier
Conflicts:
	rpc/args.go
2015-03-10 20:16:08 +01:00
obscuren f22684439a Updated RPC
* Added a generic RawMessage deserialiser
* Updated ethereum.js
* Updated coin test app
2015-03-10 20:14:38 +01:00
Taylor Gerring 3d6519e45b Update response types 2015-03-10 12:52:45 -05:00
Taylor Gerring 617804c327 Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier 2015-03-10 12:50:13 -05:00
obscuren bbe8b18660 Added unmarshalState 2015-03-10 13:40:49 +01:00
Taylor Gerring 3de51f76ee Allow integers for BlockNumber
If parsing fails, fall back to hex decoding
2015-03-09 20:38:37 -05:00
Felix Lange 9bf513e993 Merge ethereum/poc-9 into accounts-integration
Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go
2015-03-09 23:25:46 +01:00
Felix Lange 6a7e02fc9f rpc/http: delete package 2015-03-09 23:08:46 +01:00
Felix Lange a11f1d6a7e rpc: add dataDir parameter and JSON-RPC handler 2015-03-09 23:08:46 +01:00
Felix Lange b4fa94c4b1 xeth: don't sign transactions for tx call
This should make calls faster and removes interaction
with account manager.
2015-03-09 23:08:46 +01:00
obscuren a7538d0020 merge 2015-03-09 18:19:35 +01:00
obscuren 8560004f38 wip 2015-03-09 17:55:01 +01:00
obscuren 676a0de58d Max size JSON data. Closes #418 2015-03-09 17:28:12 +01:00
Taylor Gerring 9723191b19 Undo client_version changes 2015-03-09 11:04:38 -05:00