Commit Graph

1358 Commits

Author SHA1 Message Date
Tomasz Drwięga e58ec31e20 Fixing warnings 2016-03-18 10:14:19 +01:00
arkpar 4e5ebc9457 missing mut 2016-03-14 14:22:18 +01:00
arkpar f6e8c03ff6 Merge branch 'master' of github.com:ethcore/parity into titi 2016-03-14 14:18:59 +01:00
Gav Wood 5503cd4646 Lock reports to avoid out of order badness. 2016-03-14 12:41:11 +01:00
Gav Wood 7320ad077f Merge remote-tracking branch 'origin/master' into targetgaslimit 2016-03-14 10:54:38 +01:00
Arkadiy Paronyan d5fa49376e Merge pull request #713 from ethcore/docoptclean
docopts cleanups
2016-03-14 10:26:38 +01:00
Gav Wood f6b7884a1d Allow configuration of target gas limit. 2016-03-14 02:00:22 +01:00
Gav Wood 2d1a837a8b docopts cleanups.
one for @LefterisJP: 80-character line for docopts.
2016-03-14 00:52:31 +01:00
Gav Wood 97fe4fcab4 Merge pull request #701 from ethcore/sstore-key-exp
management of account expiration & memory
2016-03-13 23:19:49 +01:00
Gav Wood 8fd8f687ee Remove EarlyMerge from user docs. 2016-03-13 23:12:47 +01:00
Gav Wood 0ccb9df4f1 Merge remote-tracking branch 'origin/master' into rcdb 2016-03-13 21:43:41 +01:00
Tomasz Drwięga 54ff64c0e0 Merge branch 'master' into merge_ethminer
Conflicts:
	parity/main.rs
2016-03-13 20:42:33 +01:00
Gav Wood 81291622eb Avoid batches for now. 2016-03-13 19:22:42 +01:00
Gav Wood 5107fc5897 Update options. 2016-03-13 18:09:44 +01:00
Gav Wood 08b9cc2c41 Merge changes from #674 into branch. 2016-03-13 15:29:55 +01:00
Nikolay Volf a4f03100e9 registering timer 2016-03-13 15:11:16 +01:00
Gav Wood 02f43f2e8c Merge branch 'ethminer_crate' 2016-03-13 15:00:47 +01:00
Nikolay Volf 89dc6fa9cc io handlers 2016-03-13 14:46:45 +01:00
Gav Wood e85a2f3804 Update main.rs
[noci]
2016-03-12 19:22:38 +01:00
Gav Wood 89986ec0e0 Update main.rs
[noci]
2016-03-12 19:19:16 +01:00
Tomasz Drwięga 19b6c74675 Two more warnings 2016-03-12 13:39:17 +01:00
Gav Wood e1c0177932 Update main.rs 2016-03-12 10:44:48 +01:00
Tomasz Drwięga d0f7555348 Merge branch 'master' into updating_clippy
Conflicts:
	util/src/journaldb/archivedb.rs
2016-03-12 10:40:22 +01:00
Tomasz Drwięga 4b6e1dd4d2 Fixing warnings 2016-03-12 10:25:51 +01:00
Tomasz Drwięga 3ea52c2324 Merge branch 'master' into ethminer_crate
Conflicts:
	parity/main.rs
2016-03-12 10:22:43 +01:00
Tomasz Drwięga aebc91d96f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml
2016-03-12 09:50:18 +01:00
arkpar 896ba57555 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-11 22:43:59 +01:00
Marek Kotewicz cd835e88fc Merge pull request #661 from ethcore/rpc_pending_filter
RPC Pending Transactions Filter
2016-03-11 19:40:35 +01:00
Tomasz Drwięga fadbc61dff Merge branch 'ethminer_crate' into rpc_pending_filter
Conflicts:
	miner/src/miner.rs
	parity/main.rs
2016-03-11 19:27:09 +01:00
Tomasz Drwięga c3a79c1478 Merge branch 'master' into ethminer_crate
Conflicts:
	ethcore/src/client/client.rs
	parity/main.rs
	sync/src/chain.rs
	sync/src/lib.rs
2016-03-11 19:22:40 +01:00
Nikolay Volf 08b4488ef3 Merge branch 'master' into personal-rpc-cli
Conflicts:
	parity/main.rs
2016-03-11 20:54:18 +04:00
Tomasz Drwięga 36ff65d050 Fixing warnings 2016-03-11 14:53:03 +01:00
Tomasz Drwięga 197ea7f7d6 Using miner in rpc instead of sync 2016-03-11 14:51:07 +01:00
Nikolay Volf 8d67316ece Merge branch 'master' into reorgjdb
Conflicts:
	parity/main.rs
2016-03-11 17:41:04 +04:00
Gav Wood 38d470f3bc Reorganise command line options into more general engine. 2016-03-11 14:45:19 +01:00
Tomasz Drwięga 03da6c991f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.lock
	Cargo.toml
	ethcore/src/client/client.rs
	hook.sh
	parity/main.rs
	rpc/Cargo.toml
	rpc/src/v1/impls/eth.rs
	sync/Cargo.toml
	sync/src/tests/helpers.rs
2016-03-11 14:37:07 +01:00
Nikolay Volf 22d1def894 Merge pull request #666 from ethcore/moregethcli
More geth compatibility.
2016-03-11 16:05:27 +03:00
Gav Wood b25551be7b Merge pull request #671 from ethcore/clippy_hook
Removing running clippy by default on nightly.
2016-03-11 14:03:16 +01:00
Nikolay Volf d3f83ad7be Merge branch 'master' into personal-rpc-cli 2016-03-11 16:05:22 +04:00
Nikolay Volf ed0047725c adding cli extension 2016-03-11 15:49:49 +04:00
Tomasz Drwięga 2fd036b073 Merge branch 'ethminer_crate' into rpc_pending_filter
Conflicts:
	rpc/src/v1/helpers/poll_manager.rs
	rpc/src/v1/impls/eth.rs
2016-03-11 11:44:44 +01:00
Tomasz Drwięga d84e008e00 Removing superflous check for nightly 2016-03-11 11:16:49 +01:00
Tomasz Drwięga 5b204a5ff5 Merge branch 'master' into ethminer_crate
Conflicts:
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/lib.rs
2016-03-11 10:31:07 +01:00
Gav Wood d9c462a3d3 Use proper listen address. Tidyups. 2016-03-11 10:05:27 +01:00
Gav Wood 4c757997f6 Merge remote-tracking branch 'origin/master' into moregethcli 2016-03-10 21:41:29 +01:00
Gav Wood 29916edb91 More geth compatibility. 2016-03-10 21:36:45 +01:00
Nikolay Volf a2dea3885b refactoring to AccountService 2016-03-10 23:09:45 +04:00
Gav Wood 84a48142de Add more geth options. 2016-03-10 19:50:04 +01:00
Nikolay Volf a207b6a17e Merge pull request #664 from ethcore/sync-provider
extend sync status interface to sync provider
2016-03-10 21:18:41 +03:00
Nikolay Volf 47aacbb819 work is in progress 2016-03-10 21:56:02 +04:00
Nikolay Volf 2a24bb7cc6 Merge pull request #663 from ethcore/archive_default
--archive is default. --pruning is option.
2016-03-10 20:48:04 +03:00
Nikolay Volf 25a63611f8 extend sync status interface to sync provider 2016-03-10 20:32:17 +04:00
Gav Wood c951dee766 --archive is default. --pruning is option. 2016-03-10 17:09:34 +01:00
Tomasz Drwięga 92022ac14d Merge branch 'master' into ethminer_crate
Conflicts:
	ethcore/src/client.rs
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/chain.rs
2016-03-10 16:38:58 +01:00
Tomasz Drwięga c37370a8a7 PendingTransaction filter. 2016-03-10 16:04:59 +01:00
Gav Wood 8dd41bfe0c Merge pull request #641 from ethcore/jsonrpc_interfaces
jsonrpc uses client and sync interfaces
2016-03-10 15:44:05 +01:00
Tomasz Drwięga 9db4720162 Fixing clippy warnings. 2016-03-10 14:15:47 +01:00
Tomasz Drwięga 2e72173620 Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs
2016-03-10 12:25:36 +01:00
Gav Wood cd37fa7cb5 Merge pull request #640 from ethcore/tx_queue_min_gas
Gas price threshold for transactions
2016-03-10 11:09:09 +01:00
Gav Wood 90ae7500da Update main.rs 2016-03-10 11:07:10 +01:00
Tomasz Drwięga 02b7e7698a Breaking couple of lines to keep number of characters below limit 2016-03-10 10:09:55 +01:00
Tomasz Drwięga ca2cf8e591 Lowering minimal gas price 2016-03-10 10:05:51 +01:00
Tomasz Drwięga 2f9b955210 Merge branch 'master' into ethminer_crate
Conflicts:
	parity/main.rs
2016-03-10 09:39:26 +01:00
Gav Wood ac42045155 Merge pull request #639 from ethcore/keys-cli
Keys cli
2016-03-10 00:25:01 +01:00
Nikolay Volf 0f056f3abb Merge branch 'master' into clippy-dev
Conflicts:
	Cargo.toml
2016-03-10 02:45:53 +04:00
Nikolay Volf accc1db43f chaning docopt config a bit 2016-03-09 23:39:36 +04:00
debris 423dd7e0a9 updated jsonrpc-core and http-server libs 2016-03-09 18:04:13 +01:00
debris 082a4d9078 jsonrpc uses client and sync interfaces as a preparetion for jsonrpc tests 2016-03-09 17:31:43 +01:00
Nikolay Volf 7ff4d14544 adding return to if branch 2016-03-09 19:27:44 +04:00
Nikolay Volf f49e32cc79 Merge branch 'master' into keys-cli 2016-03-09 19:20:17 +04:00
debris bcb9b0e457 wait_for_exit takes only one input param, which is PanicHandler 2016-03-09 15:32:27 +01:00
Tomasz Drwięga 493c61f09d Minimal gas price threshold. Closes: #636 2016-03-09 15:22:11 +01:00
Tomasz Drwięga 363de973c9 Adding documentation and ditching EthMiner 2016-03-09 14:26:28 +01:00
Nikolay Volf 6ad0ba8fe2 basic commands 2016-03-09 17:11:15 +04:00
debris 3655354980 Merge branch 'master' into jsonrpc_panic_handle 2016-03-09 13:46:08 +01:00
Tomasz Drwięga 9d664336b5 Tratifying Miner 2016-03-09 13:30:59 +01:00
debris a1640dcf72 jsonrpc panic handle 2016-03-09 11:38:53 +01:00
Tomasz Drwięga b2fc077f8c Fixing CLI parameters 2016-03-08 16:42:33 +01:00
Tomasz Drwięga 9acb36af87 Fixing tests compilation. Removing ethminer dependency on client 2016-03-08 16:23:32 +01:00
Tomasz Drwięga 99a6802b61 Moving block sealing and transaction_queue to separate create 2016-03-08 15:46:44 +01:00
Tomasz Drwięga cbc2c0cf0c Fixing clippy warnings. When building on nightly it is required to enable clippy 2016-03-07 14:34:17 +01:00
Gav Wood ec3698066b Normal CLI options with geth.
Support node identity.
Support fine-grained JSONRPC API enabling.
2016-03-07 12:21:11 +01:00
Gav Wood bc2fb14b5d Add memory usage reports.
Update to be similar to master.
2016-03-06 22:39:04 +01:00
Gav Wood 559e01ea84 Review remarks resolved. 2016-03-04 22:54:59 +01:00
Gav Wood bbbaffbc53 "--archive" option for disabling the journal DB
Fixes #579
2016-03-04 21:06:28 +01:00
Gav Wood 48df869202 --author and --extra-data options. Fixed null parent-hash. 2016-03-01 16:58:14 +01:00
Gav Wood 2c32b0fc1c Merge branch 'master' into mining 2016-02-29 16:40:57 +01:00
Gav Wood 83b8e7df5a Initial refactor and block closing. 2016-02-29 14:57:41 +01:00
debris 77bfe5ae00 jsonrpc uses weak pointers to client 2016-02-29 11:58:33 +01:00
Gav Wood b3f09596b1 Merge pull request #516 from ethcore/sync
Better memory management
2016-02-27 15:54:19 +01:00
Gav Wood 5d5471f981 Fix minor typo. 2016-02-26 22:40:32 +01:00
Gav Wood 92625a5095 Merge branch 'master' of github.com:ethcore/parity 2016-02-26 22:39:23 +01:00
arkpar 34bc02af1e Merge branch 'master' of github.com:ethcore/parity into network 2016-02-26 14:23:10 +01:00
arkpar 1b9f428183 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-25 14:20:28 +01:00
arkpar 781f763f1f Memory management 2016-02-25 14:09:39 +01:00
Marek Kotewicz ba464bbac4 Merge pull request #493 from ethcore/jsonrpc_security
jsonrpc security, cors headers, fixed #359
2016-02-25 14:08:18 +01:00
arkpar cb3608c6d3 Limit download ahead 2016-02-24 21:23:58 +01:00
arkpar 40f908a499 Log formatting 2016-02-23 20:14:37 +01:00
arkpar 8beba717f8 Delayed UPnP initialization 2016-02-23 19:38:06 +01:00
Tomusdrw 07e704c968 Fixing clippy warnings. Implementing PartialEq for Uints 2016-02-23 11:40:23 +01:00
debris bda778626c Merge branch 'master' into jsonrpc_security 2016-02-23 10:28:27 +01:00
Gav Wood 72d0719223 Update docs. 2016-02-22 18:11:53 +01:00
Gav Wood a6c41514d4 Update docs. 2016-02-22 18:10:21 +01:00
Gav Wood 64d566ff52 Manage final user-input errors. 2016-02-22 13:58:41 +01:00
debris 90184658a7 jsonrpc security, cors headers, fixed #359 2016-02-22 13:41:38 +01:00
Gav Wood 63bbd0ccd8 Use proper version string. 2016-02-21 20:00:45 +01:00
Gav Wood dc3ceeb5bb Use new is_valid_node_url function. 2016-02-19 20:02:23 +01:00
Gav Wood 5f164e1c98 Merge branch 'master' of github.com:ethcore/parity 2016-02-19 19:55:26 +01:00
Gav Wood 6c82e405dd Remove regex &c., use network code for enode ID. 2016-02-19 19:42:23 +01:00
arkpar d9fec87143 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:39:43 +01:00
Gav Wood 2cc690f31f Better user errors.
Fixed up README.
2016-02-19 12:54:51 +01:00
debris 19a3daf533 parity compiling fine 2016-02-19 00:50:23 +01:00
arkpar e0623f57f9 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-18 21:49:11 +01:00
Gav Wood ae2ef83f16 Merge branch 'clippy_optional' of https://github.com/Manishearth/parity into Manishearth-clippy_optional 2016-02-18 20:59:28 +01:00
Gav Wood 7d75626e75 Fix options. 2016-02-18 14:28:24 +01:00
Gav Wood 1447fb9d30 Switch to using non-macro ready for beta. 2016-02-18 14:16:55 +01:00
Gav Wood 379876341e Correct alignment. 2016-02-18 13:56:15 +01:00
Gav Wood c6bcd464c2 Avoid changing user for daemonize. Just stick to the basics. 2016-02-18 13:54:18 +01:00
Gav Wood 7f2acedf9f Reintroduce daemonize. 2016-02-18 13:10:04 +01:00
Gav Wood ca353dd18e Remove daemonize feature. 2016-02-18 13:07:57 +01:00
Gav Wood 97f549cf5f Add daemonization. 2016-02-18 12:42:01 +01:00
Manish Goregaokar 8802fb2fd8 Make clippy an optional dependency 2016-02-17 02:07:41 +05:30
arkpar 4f73d63f90 Tweaked CLI options 2016-02-16 19:51:51 +01:00
arkpar 203947388b Get public address/UPNP refactoring 2016-02-16 02:05:36 +01:00
arkpar 0e1e80477a Save key to a file 2016-02-15 18:36:34 +01:00
Tomusdrw 2c4700f4c1 Fixing clippy warnings 2016-02-15 00:55:45 +01:00
Gav Wood 3575e6bbc1 Update main.rs 2016-02-12 00:24:10 +01:00
arkpar 01d9ffcd9b Minor fixes 2016-02-11 22:14:06 +01:00
arkpar 64b15cdbc0 Merge branch 'master' of github.com:ethcore/parity into net 2016-02-11 14:08:56 +01:00
arkpar 6281d18227 net-key option 2016-02-11 14:08:52 +01:00
Gav Wood 439e99d32b Option for no init nodes. 2016-02-11 10:46:55 +01:00
Gav Wood b4faad8469 Merge branch 'master' into cliopt 2016-02-10 23:51:22 +01:00
Gav Wood 9ac4f51601 Allow path to be configured. 2016-02-10 21:17:47 +01:00
Nikolay Volf 428962df35 Merge pull request #400 from ethcore/upnp
Upnp
2016-02-10 22:25:19 +03:00
Arkadiy Paronyan 0f665a6cbc Merge pull request #398 from ethcore/jsonrpc2
eth_syncing, fixed #397
2016-02-10 19:13:00 +01:00
Gav Wood e8aaf26ab4 Revert printing trie insertion stats. 2016-02-10 18:26:03 +01:00
Gav Wood 637ca97dc6 Synchronous UPnP. 2016-02-10 18:11:10 +01:00
Gav Wood 39d5b68785 Merge branch 'master' of github.com:ethcore/parity 2016-02-10 17:21:07 +01:00
Gav Wood 5c73c298dc Merge branch 'master' of github.com:ethcore/parity 2016-02-10 16:46:06 +01:00
Gav Wood 35374ac09c Start of UPnP. 2016-02-10 16:45:54 +01:00
Tomusdrw 96dda7b73a Forwarding panics from threads 2016-02-10 16:35:52 +01:00
debris 9159d5812b eth_syncing, fixed #397 2016-02-10 16:28:59 +01:00
Tomusdrw 7925642b1b Removing overengineered stuff 2016-02-10 15:28:43 +01:00
Tomusdrw 31bcc541d0 Fixing parity build 2016-02-10 14:16:53 +01:00
Tomusdrw 6b0cc0c8fa Merge branch 'master' into close_gently
Conflicts:
	parity/main.rs
2016-02-10 13:13:04 +01:00
Tomusdrw 2a498fc3eb Implementing PanicHandlers for all places when new thread is spawned. Handling Client panics 2016-02-10 12:50:27 +01:00
Gav Wood d8f8038f16 Additional tweaks to options. 2016-02-09 17:23:25 +01:00
Gav Wood e987a492dc --chain option for setting which network to go on.
Add contents function to util.
2016-02-09 15:51:48 +01:00
Gav Wood 9d495d5beb Network params. 2016-02-08 15:04:12 +01:00
Gav Wood 36ebacbe10 Merge pull request #357 from ethcore/ark
Raise FD limit for MacOS
2016-02-05 15:19:29 +01:00
arkpar f06e444737 Raise FD limit for macos 2016-02-05 13:49:36 +01:00
debris c90d64662a added license in every *.rs file 2016-02-05 13:40:41 +01:00
Gav Wood 8e892fe60e Remove println for options. 2016-02-04 00:48:51 +01:00
Gav Wood f2b8d6336a Fix default options. 2016-02-04 00:48:36 +01:00
debris 21913b29b5 Merge branch 'master' into travis_fixes 2016-02-02 02:37:43 +01:00
debris baec2909b6 added dumb tests for parity and ethcore-rpc to include them in coverage reports, added TARGETS env variable to travis.yml 2016-02-02 02:04:03 +01:00
Gav Wood 54924d14b3 Include JSONRPC CLI options.
Bump version numbers.
Update Trie benchmarks.
Disable RLP benchmark (@debrid please fix).
2016-02-02 01:59:14 +01:00
debris 02f5004161 moving around dirs 2016-01-31 11:08:04 +01:00