Commit Graph

1073 Commits

Author SHA1 Message Date
Péter Szilágyi d099a42c85 cmd/geth: fix monitor panic, don't pre-fill with dummy data 2015-06-26 22:05:49 +03:00
Péter Szilágyi 7e69392249 cmd/geth: re-scale charts when changing unit magnitudes 2015-06-26 21:48:21 +03:00
Péter Szilágyi e9c0b5431c cmd/geth: finalize mem stats 2015-06-25 16:19:42 +03:00
Péter Szilágyi fdbf8be735 cmd/geth, rpc/api: fix reported metrics issues 2015-06-25 15:33:26 +03:00
Péter Szilágyi c0343c8f17 cmd/geth: add memory stat collection too 2015-06-25 13:47:06 +03:00
Péter Szilágyi c6e2af14c0 cmd/geth: limit the maximum chart colums to 6 2015-06-25 12:12:11 +03:00
Péter Szilágyi 3ea6b5ae32 cmd/geth: list the available metrics if none specified 2015-06-25 11:42:45 +03:00
Péter Szilágyi d02f07a983 cmd/geth: polish monitor visuals, add footer, refresh flag 2015-06-25 11:32:21 +03:00
Péter Szilágyi b98b444179 cmd/geth: add attach and rows flags to the monitor command 2015-06-25 10:36:47 +03:00
Péter Szilágyi 92ef33d97a rpc/api, cmd/geth: retrievel all percentiles, add time units 2015-06-24 18:34:05 +03:00
Péter Szilágyi 302187ae39 cmd/geth: allow branching metric patterns 2015-06-24 18:34:05 +03:00
Péter Szilágyi bf99d5b33c cmd/geth: polish the monitoring charts a bit 2015-06-24 18:34:05 +03:00
Péter Szilágyi e5b820c47b cmd/geth, rpc/api: extend metrics API, add a basic monitor command 2015-06-24 18:34:05 +03:00
Péter Szilágyi bde2ff0343 cmd/geth, rpc/api: move the metrics into the new console 2015-06-24 18:34:05 +03:00
Péter Szilágyi 7f92e708c5 cmd/geth, core: impl. percentile reporting, instrument insertions 2015-06-24 18:34:04 +03:00
Péter Szilágyi b426301467 cmd/geth, eth/fetcher: polish metrics reporting, add some more 2015-06-24 18:34:04 +03:00
Péter Szilágyi 821e01b013 cmd/geth, eth/fetcher: initial metrics support
Conflicts:
	cmd/geth/admin.go
2015-06-24 18:33:33 +03:00
Jeffrey Wilcke 22c7ce0162 cmd/geth: version bump 0.9.33 2015-06-23 19:20:20 +02:00
Jeffrey Wilcke 67e6f74e9a cmd/geth: bump 2015-06-23 19:11:20 +02:00
Bas van Kervel 2b3957f373 fixed relative path issue with javascript files 2015-06-23 09:38:30 +02:00
Bas van Kervel 55424a11af improved action description 2015-06-23 09:11:57 +02:00
Bas van Kervel 4ee7f6fc88 added missing change for sign test 2015-06-22 13:54:13 +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 29297d3b82 fixed bug where history file was create in cwd 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 36a6b16a3b removed console 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 5c25403b13 refactored old rpc structure to new 2015-06-22 08:54:21 +02:00
Jeffrey Wilcke 3deded28a5 Merge pull request #1302 from obscuren/mist-removal
mist: R.I.P.
2015-06-21 07:58:08 -07:00
obscuren 42a14b8a09 mist: R.I.P.
/"""""/""""""".
    /     /         \             __
   /     /           \            ||
  /____ /             \           ||
 |     |  In Loving    |          ||
 |     |   Memory      |          ||
 |     |               |          ||
 |     |   2014-2015   |          ||
 |     |     * *   * * |         _||_
 |     |     *\/* *\/* |        | TT |
 |     |     *_\_  /   ...""""""| || |.""...."""""""".""
 |     |         \/.."""""..."""\ || /.""".......""""...
 |     |...."""""""........""""""^^^^"......."""""""".."
 |......"""""""""""""""........"""""...."""""..""-Jeff W.
2015-06-20 14:37:00 +02:00
Taylor Gerring d1e589289c Expand --test switch 2015-06-19 15:08:53 +02:00
Taylor Gerring 0743243dce Add --skip option to CLI
Disassociates hardcoded tests to skip when running via CLI. Tests still
skipped when running `go test`
2015-06-19 11:38:23 +02:00
Taylor Gerring 01ec4dbb12 Add stdin option 2015-06-18 22:24:07 +02:00
Taylor Gerring a86452d22c Minor cleanup 2015-06-18 22:20:45 +02:00
Taylor Gerring 49336675f3 Expand CLI options to allow running all tests 2015-06-18 22:20:45 +02:00
Taylor Gerring 516362bcad Allow specifying single depth directory 2015-06-18 22:20:45 +02:00
Taylor Gerring c941a39b75 Cleanup logging 2015-06-18 22:20:45 +02:00
Taylor Gerring 8507c867b9 Fix geth blocktest command 2015-06-18 22:20:45 +02:00
Taylor Gerring 6931267324 Wire ethtest to new tests structure 2015-06-18 22:20:45 +02:00
Taylor Gerring 6415ed0730 Require a first argument of test type 2015-06-18 22:13:41 +02:00
Jeffrey Wilcke ae36beb38f Merge pull request #1269 from bas-vk/console-batch
added batch mode to console
2015-06-17 07:56:09 -07:00
obscuren dfd18d245a cmd/geth: bump 0.9.31 2015-06-15 19:29:22 +02:00
obscuren 4673b04503 cmd/geth: bump version number 0.9.30 2015-06-15 19:14:34 +02:00
zsfelfoldi 1e3f4877c0 Changed miner and gpo min gas price to 1 szabo 2015-06-15 16:48:59 +02:00
Bas van Kervel f06f220c7c added printing support for objects 2015-06-15 16:33:36 +02:00
zsfelfoldi 3f94d09c1f fixed saving receipts 2015-06-15 15:55:38 +02:00
Bas van Kervel 2a0528303f added batch mode to console 2015-06-13 19:02:46 +02:00
Bas van Kervel 55a796b7c3 removed obsolete console flag 2015-06-12 09:42:57 +02:00
Bas van Kervel 359e6414e5 fixed windows ipc path issue 2015-06-12 09:32:37 +02:00
Bas van Kervel 22080e1fdd ipc socket always used default path 2015-06-11 20:35:19 +02: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 ebaa9b9feb removed binary files 2015-06-11 14:54:03 +02:00
Bas van Kervel aa258dcc5f added console binary 2015-06-11 14:18:54 +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 bd38428f33 cleanup of javascript API 2015-06-11 14:01:41 +02:00
Bas van Kervel c6c443385b changed console welcome message 2015-06-11 14:01:41 +02:00
Bas van Kervel faab931ce1 only load supported api's 2015-06-11 14:01:40 +02:00
Bas van Kervel cb7f2d43b6 added console binary 2015-06-11 14:01:40 +02:00
Bas van Kervel 0a600a03ee fixed unittest 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
Jeffrey Wilcke 6609d45ef4 Merge pull request #1228 from obscuren/vm-optimisations
core/vm: optimisations
2015-06-11 03:32:39 -07:00
obscuren 9e9bd35557 cmd/geth: Added optional debug flag for reprocess block 2015-06-11 11:44:39 +02:00
obscuren 5cfae0536f cmd/evm: print trace when running programs 2015-06-10 21:09:12 +02:00
Péter Szilágyi c4af70d0cc cmd/geth: round the import ETA before converting to string 2015-06-10 18:07:23 +03:00
Péter Szilágyi 271fb20ecb cmd/geth, eth/downloader: rough guess at the import eta 2015-06-10 18:01:05 +03:00
obscuren f249ccaa89 cmd/evm: implements vm.Environment 2015-06-10 16:46:43 +02:00
Péter Szilágyi b3d5ce7d48 cmd/geth, eth/downloader: collect and report import progress too 2015-06-10 01:20:35 +03:00
obscuren 7e58949c3f cmd/geth: develop version bump 0.9.29 2015-06-09 21:14:11 +02:00
obscuren 93f4852844 cmd/geth: bumped version number 0.9.28 2015-06-09 21:01:02 +02:00
Jeffrey Wilcke 0f1cdfa53a Merge pull request #1193 from tgerring/hotbackup
Improve export command
2015-06-08 16:32:38 -07:00
Jeffrey Wilcke 55b7c14554 Merge pull request #1199 from obscuren/settable_genesis_nonce
core: settable genesis nonce
2015-06-08 13:43:41 -07:00
Taylor Gerring 44e5ff7d15 Fix blocktest 2015-06-08 12:55:15 -04:00
obscuren 6244b10a8f core: settable genesis nonce
You can set the nonce of the block with `--genesisnonce`. When the
genesis nonce changes and it doesn't match with the first block in your
database it will fail. A new `datadir` must be given if the nonce of the
genesis block changes.
2015-06-08 18:33:43 +02:00
Taylor Gerring 2729e6294a Improved error checking 2015-06-06 10:04:13 -04:00
Taylor Gerring ed621aae33 Cleanup 2015-06-06 09:50:23 -04:00
Taylor Gerring d65b64c884 Allow export command to take first and last args 2015-06-06 00:02:32 -04:00
obscuren 43ceb0f5c7 cmd/geth: version bump 0.9.27 2015-06-05 17:36:42 +02:00
obscuren 2bb0e48a7b skipped failing natspec tests 2015-06-04 13:17:47 +02:00
obscuren 9b27fb91c0 cmd/geth, common/natspec: updating tests (still failing?) 2015-06-04 11:41:20 +02:00
Felix Lange 5197aed7db cmd/utils, eth: core.NewBlockProcessor no longer needs TxPool 2015-06-03 22:43:23 +02:00
obscuren 770a0e7839 wip 2015-06-03 22:39:17 +02:00
Gustav Simonsson 147a699c65 Add missing err checks on From() (skip RPC for now) 2015-06-01 22:12:03 +02:00
obscuren d51d74eb55 cmd/geth: bump version v0.9.26 2015-05-28 17:43:05 +02:00
Jeffrey Wilcke a225ef9c13 Merge pull request #1140 from Gustav-Simonsson/fix_account_unlock_logging
Validate account length and avoid slicing in logging
2015-05-28 07:39:13 -07:00
Jeffrey Wilcke 03178a77b6 Merge pull request #1132 from obscuren/log_optimisations
core: log optimisations
2015-05-28 07:35:07 -07:00
Gustav Simonsson 9138955ba5 Validate account length and avoid slicing in logging 2015-05-28 15:20:05 +02:00
Felix Lange e84bbcce3c cmd/geth: don't flush databases after import 2015-05-28 01:20:58 +02:00
Felix Lange e1fe75e3b6 cmd/utils: use constant for import batch size 2015-05-28 01:20:58 +02:00
Felix Lange a8bc2181c9 cmd/utils: skip batches with known blocks during import
This makes block importing restartable.
2015-05-28 01:20:58 +02:00
Felix Lange 67effb94b6 cmd/geth, cmd/utils: make chain importing interruptible
Interrupting import with Ctrl-C could cause database corruption
because the signal wasn't handled. utils.ImportChain now checks
for a queued interrupt on every batch.
2015-05-28 01:09:26 +02:00
Felix Lange 705beb4c25 cmd/utils: print errors only once if stdout and stderr are the same file 2015-05-28 01:09:26 +02:00
Felix Lange 74706a0f02 cmd/geth, cmd/utils: rename utils.Get* -> utils.Make*
The renaming should make it clearer that these functions create a new
instance for every call. @obscuren suggested this renaming a while ago.
2015-05-28 01:09:26 +02:00
Felix Lange 651030c98d cmd/geth: move blockchain commands to chaincmd.go 2015-05-28 01:09:26 +02:00
Felix Lange 62671c93c4 cmd/mist: use utils.SetupLogger 2015-05-28 01:09:26 +02:00
Felix Lange 3b9808f23c cmd/geth, cmd/utils: don't use Ethereum for import, export and upgradedb
The blockchain commands don't need the full stack. With this change,
p2p, miner, downloader, etc are no longer started for blockchain
operations.
2015-05-28 01:09:26 +02:00
obscuren e3253b5d5e core: fixed an issue with storing receipts 2015-05-28 01:00:23 +02:00
Péter Szilágyi 3f91ee4ff8 cmd/geth: expand admin.progress() to something meaningful 2015-05-27 16:46:46 +03:00
Jeffrey Wilcke e13f413ef5 Merge pull request #1112 from fjl/fix-console-exit
cmd/geth: exit the console cleanly when interrupted
2015-05-27 04:40:29 -07:00
obscuren 2c532a7255 cmd/geth: bump version 0.9.25 2015-05-27 02:06:52 +02:00
obscuren 222249e622 cmd/geth: Flush instead of close. This solves a nil ptr error 2015-05-27 01:38:41 +02:00
obscuren b2f2806055 cmd/geth, core: Updated DB version & seedhash debug method 2015-05-27 01:38:41 +02:00
Felix Lange 9253fc337e cmd/geth: exit the console cleanly when interrupted
This fix applies mostly to unsupported terminals that do not trigger the
special interrupt handling in liner. Supported terminals were covered
because liner.Prompt returns an error if Ctrl-C is pressed.
2015-05-27 00:54:48 +02:00
Felix Lange 6a674ffea5 Merge pull request #1108 from karalabe/fine-seeding
Fine tune seeder and p2p peer handling
2015-05-26 22:03:11 +02:00
Jeffrey Wilcke a55f408c10 Merge pull request #1090 from fjl/jsre-fixes
jsre: fixes for concurrent use, improved timer handling
2015-05-26 11:06:54 -07:00
Péter Szilágyi 4de8213887 cmd/geth: fix js console test for p2p server update 2015-05-26 19:35:31 +03:00
Péter Szilágyi e1a0ee8fc5 cmd/geth, cmd/utils, eth, p2p: pass and honor a no discovery flag 2015-05-26 19:07:24 +03:00
obscuren d74ee40c86 cmd/geth: bumped version to 0.9.24 2015-05-26 14:51:28 +02: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
Bas van Kervel 821b578f7e make registrar available in console 2015-05-22 09:13:45 +02:00
obscuren 4600ecb5c7 cmd/geth: bump version 0.9.23 2015-05-21 18:02:15 +02:00
zelig bed80133e0 automatic DAG pregeneration for smooth epoch transitions
- backend: AutoDAG bool flag passed from cli/eth.Config to ethereum, autoDAG loop started if true
- backend: autoDAG loop start/stop, remove previous DAG
- cli: AutoDAG bool flag, off by default, but automatically ON if mining
- admin jsre: add startAutoDAG stopAutoDAG and makeDAG in miner section
- switch on/off DAG autogeneration when miner started/stopped on console
2015-05-21 15:53:42 +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 d92172f3d4 add usage doc to wallet import 2015-05-20 02:47:13 +01:00
zelig 22b694ee1e solc now in ethereum, fixes solc path setting; setSolc() didnt work 2015-05-20 02:47:13 +01:00
zelig f9abcee0f9 fix solc tests unskip 2015-05-20 02:47:13 +01:00
Taylor Gerring 32b8565022 Support multiple account unlock attempts 2015-05-19 14:46:32 -05:00
Taylor Gerring af8ada45e7 Allow unlocking multiple accounts #1045
Separate accounts with spaces when using --unlock
2015-05-19 13:40:41 -05:00
Jeffrey Wilcke bd0c0a633b Merge pull request #1022 from obscuren/parallel_nonce_checks
Parallelise nonce checks
2015-05-18 11:13:53 -07:00
Taylor Gerring 0864f1fc8e Remove unused confirm() method 2015-05-18 12:25:33 -05:00
Taylor Gerring f14feea436 Refactor user prompts into utils 2015-05-18 12:24:30 -05:00
Taylor Gerring 36a4ba3248 Add user confirmation for removedb 2015-05-18 12:04:35 -05:00
obscuren 59c0d01418 core: chain manager no longer exports genesis block 2015-05-18 18:16:53 +02:00
Taylor Gerring fe41bd6fe8 Add "removedb" command to Geth
Removes the state and blockchain databases
2015-05-18 10:54:15 -05:00
obscuren c67424ecc8 core: parallelise nonce checking when processing blocks
ChainManager now uses a parallel approach to block processing where all
nonces are checked seperatly from the block processing process. This
speeds up the process by about 3 times on my i7
2015-05-18 13:59:22 +02:00
obscuren 280b7f23af Merge branch 'hotfix/0.9.22' into develop 2015-05-17 21:35:29 +02:00
obscuren 3a51d5e80c cmd/geth: fixed ver num 2015-05-17 21:34:28 +02:00
obscuren 28ba374f27 cmd/geth: delete state db on upgradedb command 2015-05-16 17:43:19 +02:00
obscuren ad7b0efbd3 cmd/geth: hotfix bump 2015-05-16 13:02:30 +02:00
obscuren 7ea76fcf99 core, cmd/geth, cmd/mist: cleanup. bump version 0.9.21 2015-05-16 00:26:36 +02:00
obscuren 55d85d60fd eth, cmd/geth: start mining from console respects CLI flag 2015-05-15 20:26:15 +02:00
Felix Lange 559cc02313 cmd/geth: use plain keystore for JS tests
This reduces the time it takes to run the tests back to 3 seconds.
2015-05-14 17:51:05 +02:00
Jeffrey Wilcke ff87c241a7 Merge pull request #973 from bas-vk/issue972
Introduced default unlock duration when an account is unlocked from t…
2015-05-14 05:48:31 -07:00
Bas van Kervel 1fa48bc5e7 Introduced default unlock duration when an account is unlocked from the console 2015-05-14 14:25:48 +02:00
Jeffrey Wilcke 7fa740996c Merge pull request #960 from fjl/nat-fixes
p2p/nat: fix UPnP auto discovery
2015-05-14 04:06:13 -07:00
Felix Lange 5f706cd7f5 cmd/utils: print messages from package log through glog
Some of the dependencies use package log. This change ensures that the
log output looks uniform and respects glog flags.
2015-05-14 12:56:37 +02:00
Bas van Kervel e30e9fe979 removed invalid filename characters 2015-05-13 12:38:12 +02:00
Gustav Simonsson b5b53d8b32 Fix hex conversion in --unlock and log when successful 2015-05-13 01:11:17 +02:00
obscuren 36ce54e5dc cmd/geth: bump version to 0.9.20 2015-05-12 19:01:01 +02:00
Gustav Simonsson e389585f1f Change default keystore dir 2015-05-12 18:33:04 +02:00
Gustav Simonsson 231fe04f03 Fix address type in js test 2015-05-12 17:48:21 +02:00
Gustav Simonsson 2c1b0ff17e Update key store to new spec but keep address field for now
* Also fix address types post-rebase
2015-05-12 17:22:17 +02:00
Gustav Simonsson da9fe951da Use common.Address type for accounts.Address 2015-05-12 17:19:39 +02:00
Jeffrey Wilcke 58d6ec689f Merge pull request #933 from bas-vk/issue928
replaced path with platform aware filepath module
2015-05-12 08:23:46 -07:00
obscuren dca290d525 sol: skipped source checking step 2015-05-12 16:19:14 +02:00
Bas van Kervel 95773b9673 removed redundant newlines in import block 2015-05-12 15:20:53 +02:00
Bas van Kervel b79dd188d9 replaced several path.* with filepath.* which is platform independent 2015-05-12 14:24:11 +02:00
obscuren 66de3f0aa8 xeth, rpc: implement eth_estimateGas. Closes #930 2015-05-12 14:21:43 +02:00
zelig 03bf902b92 compiler, cli/js: fix solidity compiler tests failing when a different version of solc installed 2015-05-12 12:36:54 +02:00
obscuren 97dd4551ef miner, cmd/geth: miner will not ignored owned account transactions
Miner does not ignore low gas txs from accounts that are owned.
2015-05-11 21:47:34 +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 7551264fa6 cmd/geth, cmd/mist: version 0.9.19 2015-05-10 03:38:46 +02:00
obscuren 45dc690947 cmd/mist: version bump 2015-05-09 13:37:22 +02:00
obscuren 658ac3c257 cmd/geth: bump version 0.9.18 2015-05-09 12:54:27 +02:00
obscuren 13ddf20bd2 miner, cmd/geth: settable gas price from flags and console
* --gasprice "<num>" flag
* admin.miner.setGasPrice( <num> )
2015-05-09 12:04:00 +02:00
obscuren cb1fa523e4 cmd/geth, cmd/mist, eth, flags: renamed loglevel to verbosity 2015-05-09 12:00:51 +02:00
Daniel A. Nagy 1fe70a66ba Signature test. 2015-05-08 19:37:35 +02:00
obscuren c8fc4cebe6 version 0.9.17 2015-05-08 17:24:41 +02:00
Felix Lange e45d9bb29d cmd/utils: bump default maxpeers to 25
This should improve ethereum block propagation times since
we're not not broadcasting blocks to 100% of peers.
2015-05-08 16:09:55 +02:00
Jeffrey Wilcke 23454dcfcb Merge pull request #840 from karalabe/throttled-dialing
p2p: throttled handshakes
2015-05-08 06:53:40 -07:00
obscuren f6e71b5749 updated ethereum.js 2015-05-08 13:05:20 +02:00
obscuren 351d6b0d44 jsre, cmd/geth: updated web3.js and altered settimeout 2015-05-08 13:05:20 +02:00
Péter Szilágyi 4d5a719f25 cmd, eth, p2p: introduce pending peer cli arg, add tests 2015-05-07 15:30:56 +03: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
Jeffrey Wilcke 82ac4712f1 Merge pull request #867 from Gustav-Simonsson/fix_block_tests_genesis_block_total_difficulty
Fix block tests genesis block total difficulty
2015-05-06 14:52:55 -07:00
Gustav Simonsson 7bc1f487b8 Unskip now working tests, remove debug print 2015-05-06 23:25:44 +02:00
obscuren b719801db0 cmd/geth: gofmt screwup fix 2015-05-06 23:10:46 +02:00
obscuren 458d891c63 cmd/geth: version bump 2015-05-06 23:04:49 +02:00
obscuren 062fa049d0 fixed merge issue 2015-05-06 22:54:21 +02:00
Jeffrey Wilcke 323216ed85 Merge pull request #861 from obscuren/transaction_pool_fixes
core: transaction pool fixes & resending transactions
2015-05-06 11:23:58 -07:00
Jeffrey Wilcke 1f26a1b863 Merge pull request #859 from Gustav-Simonsson/ethash_reloaded
Ethash reloaded
2015-05-06 11:20:54 -07:00
obscuren 05ac1209c7 cmd/geth: limit `pendingTransactions` to owned accounts. 2015-05-06 18:30:56 +02:00
obscuren eb4029257a cmd/mist: updated xeth transact 2015-05-06 18:30:56 +02:00
obscuren 5ebc22807c cmd/geth: admin, switched price with limit in arguments 2015-05-06 18:30:56 +02:00
obscuren 7fed424435 cmd/geth: implemented resending transaction with different gas settings 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
Péter Szilágyi c750ef09e1 cmd/geth: fix #853 colorize console output in windows 2015-05-05 14:44:39 +03:00
Gustav Simonsson b1cc9cdc74 Integrate new ethash API and change geth makedag cmd 2015-05-05 08:24:15 +02:00
Péter Szilágyi 2382da4179 cmd/mist: fix a stale error message 2015-05-04 13:11:43 +03:00
obscuren ba2236fa51 cmd/geth, eth: bump version & tmp fix for incorrect TD peers 2015-05-03 14:11:47 +02:00
Péter Szilágyi 701591b403 cmd, eth, p2p: fix review issues enumerated by Felix 2015-04-30 16:15:29 +03:00
Péter Szilágyi 679c90b873 cmd/geth, cmd/utils, eth: internalize trusted node config file 2015-04-30 16:03:47 +03:00
Péter Szilágyi de0549fabb cmd/geth, cmd/mist, cmd/utils, eth, p2p: support trusted peers 2015-04-30 16:03:10 +03:00
obscuren 30b921ef46 cmd/geth: bump version to 0.9.14 2015-04-30 00:40:14 +02:00
obscuren 735b029db9 core: return the index of the block that failed when inserting a chain 2015-04-29 14:00:24 +02:00
Jeffrey Wilcke 764e81bf12 Merge pull request #825 from obscuren/develop
core: chain fork fix
2015-04-29 04:47:26 -07:00
obscuren 745c368987 cmd/geth: bump version number 2015-04-29 12:54:41 +02:00
Felix Lange 72d8878084 cmd/mist: always enable whisper
The default value of the Shh option is true, but cli can't
see it because it is not part of the mist options.
2015-04-29 02:13:36 +02:00
Felix Lange eb5e43022e cmd/geth, cmd/mist: use gitCommit in node name 2015-04-29 02:13:36 +02:00
Felix Lange f4e5675303 cmd/mist: add blockchain version flag
This is necessary because cli doesn't see the default
value unless the flag is included.
2015-04-29 02:13:35 +02:00
Jeffrey Wilcke 91cb8cdd2a Merge pull request #793 from karalabe/discovery-node-cache
p2p/discover: persistent node database
2015-04-28 03:40:10 -07:00
Gustav Simonsson 34c94d5fcd Add loading of block test privkey if present 2015-04-27 20:30:26 +02:00
obscuren 7fd368c586 geth/main: removed crazy welcome message :-( 2015-04-26 11:30:33 +02:00
obscuren a237ff65ea web3: updated 2015-04-26 11:21:15 +02:00
Jeffrey Wilcke 8d09f95bc7 Merge pull request #805 from obscuren/download_improvements
eth, eth/downloader: improve downloader and remove asynchronousness
2015-04-24 15:56:17 -07:00
obscuren ed036a2ce7 cmd/geth: bump version number 0.9.12 2015-04-24 23:57:05 +02:00
obscuren 405720b218 xeth, core, cmd/utils: Transaction can not be over block gas limit
Transactions will be invalidated when the tx.gas_limit > block.gas_limit
2015-04-24 17:48:13 +02:00
Péter Szilágyi 8646365b42 cmd/bootnode, eth, p2p, p2p/discover: use a fancier db design 2015-04-24 18:04:41 +03:00
Jeffrey Wilcke 168ff36676 Merge pull request #773 from ethersphere/frontier/cli
CLI and JS admin changes
2015-04-24 06:58:31 -07:00
Alexandre Van de Sande 8716278ca8 Smaller frontier cover art 2015-04-24 13:50:23 +02:00
zelig c5e9a0a71c cli: correct bootnodes flag usage help line 2015-04-24 12:46:53 +01:00
zelig 6b1b5a4a2a cli/js console: if corsDomain is not given to startRpc, we fall back to value set on command line with `-corsDomain` 2015-04-24 12:45:11 +01:00
zelig 1b7c017076 cli: fatal error if no etherbase for mining 2015-04-24 12:45:11 +01:00
zelig 6512b23b98 cli: fatal error if rpc could not be started 2015-04-24 12:45:11 +01:00
zelig 7b2f25b578 cli: clean up flag descriptions, usage docs, account list uses primary and indexes, add help line to account subcnd usage 2015-04-24 12:45:11 +01:00
zelig 22450c069b js console: add cors domain optional argument to startRpc 2015-04-24 12:45:11 +01:00
zelig a3fb41981e cmd/admin: rename debug.block to debug.processBlock; move backtrace under debug 2015-04-24 12:45:11 +01:00
obscuren dc62fb2ee9 web3: updated 2015-04-24 11:39:43 +02:00
obscuren 92c6327593 cmd/geth, jsre: updated ethereum.js => web3.js 2015-04-24 11:37:58 +02:00
Péter Szilágyi 6def110c37 cmd/bootnode, eth, p2p, p2p/discover: clean up the seeder and mesh into eth. 2015-04-24 11:33:55 +03:00
Péter Szilágyi 5f735d6fce cmd, eth, p2p, p2p/discover: init and clean up the seed cache 2015-04-24 11:23:20 +03:00
Alexandre Van de Sande d2fab43abc Changed "Welcome to the Frontier" to something more geeky 2015-04-22 18:33:33 +02:00
Felix Lange e1f616fadf cmd/geth: improve the JS tests
These changes ensure that the JS tests run without networking
and fixes the block chain export and its associated test.
2015-04-22 12:31:19 +02:00
Felix Lange 2f4cc72119 Merge pull request #765 from Gustav-Simonsson/more_block_test_improvements
Further fixes to block test wrapper
2015-04-22 11:53:02 +02:00
Jeffrey Wilcke 1dc91975ad Merge pull request #756 from Gustav-Simonsson/block_test_improvements
Block test improvements
2015-04-21 03:09:35 -07:00
Gustav Simonsson b448390889 Further fixes to block test wrapper
* Move go test wrapper for block tests from cmd/geth to tests
* Fix logic for when tests are valid or not, by adding correct
  validations for expected valid/invalid blocks
* Change block insertion helper to work on single blocks
* Add one test case for each file in BlockTests and comment out
  the tests which are currently failing
* Add Skip call in all block tests in lieu of performance fixes
  around ethash cache which are needed before it will be fast enough
  to start / stop the node between each test
2015-04-21 05:23:10 +02: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
Jeffrey Wilcke 3d7c1b8194 Merge pull request #755 from karalabe/command-flags-cleanup
cmd/geth, cmd/utils: add cli flags for pprof and whisper
2015-04-20 09:17:04 -07:00
Péter Szilágyi 3b008723db cmd/geth, cmd/utils: invert --pprof once more 2015-04-20 19:14:49 +03:00
obscuren 36ec42e50c Merge branch 'frontier/natspec' of https://github.com/ethersphere/go-ethereum into ethersphere-frontier/natspec 2015-04-20 18:08:14 +02:00
Péter Szilágyi c8e2b3710c cmd/geth, cmd/utils: use pprof disable flag, start globally 2015-04-20 18:59:41 +03:00
Gustav Simonsson 805345d135 Add block tests wrapper and fixes for tx tests
* Add fixes to parsing and converting of fields in tx tests
* Correct logic in tx tests; validation of fields and correct
  logic for when RLP decoding works/fails and when this is
  expected or not
* Rename files for consistency
* Add block tests wrapper to run block tests with go test
2015-04-20 17:46:35 +02:00
Péter Szilágyi 8830403acf cmd/geth, cmd/utils: add cli flags for pprof and whisper. 2015-04-20 18:45:37 +03:00
obscuren 76025cc424 geth: added a `admin.debug.block` command which reprocess the block 2015-04-20 16:03:19 +02:00
obscuren 45da3e17e2 core: added chain head reset to known block 2015-04-20 12:29:02 +02:00
obscuren 52584596d4 geth: bump version number 2015-04-20 12:01:39 +02:00
zsfelfoldi bb793c829f fixed incomplete merge 2015-04-19 20:57:49 +01:00
zsfelfoldi c4b7d4d3f7 NatSpec cli option, resolver tests passing 2015-04-19 20:57:49 +01:00
zsfelfoldi b46e152171 default fallback NatSpec messages 2015-04-19 20:57:49 +01:00
zelig ac0e5e8b6d resolver tests
- add resolver tests and fix resolver to pass
- statereg constructor fixed
- comments added to natspec plus docserver integration for natspec userdoc fetching
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
zelig 45676382b6 natspec integrated to console frontend confirmTransaction 2015-04-19 20:57:48 +01:00
obscuren 5dd56bb474 geth: admin download status 2015-04-19 21:46:19 +02:00
obscuren 8f3a7e41de Merge branch 'rlp-size-validation' of https://github.com/fjl/go-ethereum into fjl-rlp-size-validation
Conflicts:
	eth/protocol.go
2015-04-19 17:07:40 +02:00
obscuren 6e1aa91aaf geth: added getBlockRlp for dumping block in rlp format 2015-04-19 13:30:55 +02:00
Felix Lange 235ed7ecb9 cmd/geth, tests: enable running multiple tests from a single file
This commit also changes the block test loading so tests containing
invalid RLP blocks can be loaded and return an error only when they are
run.

(cherry picked from commit 898ba87984)
2015-04-19 00:06:52 +02:00
obscuren 03b4cf74a2 geth: added identity flag which allows to set a custom node name 2015-04-18 23:53:30 +02:00
obscuren f1ae3dc4aa geth: bump version number 2015-04-18 02:27:50 +02:00
Felix Lange 56a48101dc cmd/rlpdump, cmd/utils, eth, p2p, whisper: use rlp input limit 2015-04-17 14:45:09 +02:00
Bas van Kervel 57f93d25bd admin.stopRPC support added which stops the RPC HTTP listener 2015-04-16 12:56:51 +02:00
obscuren f46af4508b geth: fixed failing cli tests 2015-04-14 21:26:28 +02:00
obscuren 13eb46ea94 geth: added print block to admin 2015-04-14 12:49:30 +02:00
Jeffrey Wilcke 5f9346bc7a Merge pull request #700 from bas-vk/issue_650
Added blockchain DB versioning support, closes #650
2015-04-13 17:34:34 +02:00
Bas van Kervel 49a513bdeb Added blockchain DB versioning support, closes #650 2015-04-13 10:13:52 +02:00
obscuren f047699afb Updated glog 2015-04-10 19:59:07 +02:00
obscuren 36fe11378c Bump 2015-04-10 18:21:27 +02:00
obscuren 3d29805322 Added pprof 2015-04-10 17:38:06 +02:00
Péter Szilágyi d1729acd2b cmd/mist: fix another nil recipient address panic. 2015-04-10 11:43:08 +03:00
Jeffrey Wilcke 4de1e1609a Merge pull request #682 from bas-vk/issue_567
bugfix as a result of PR 671
2015-04-09 23:42:17 +02:00
Bas van Kervel dc2b9fd458 bugfix as a result of PR 671 2015-04-09 20:06:27 +02:00
obscuren ec9fbf09aa Added some quotes .... 2015-04-09 18:24:22 +02:00
obscuren b0f40beea6 Added proper contract for registrar 2015-04-09 17:59:05 +02:00
obscuren ab015959e1 bump 2015-04-09 17:54:20 +02:00
obscuren 2747df3df1 added contracts 2015-04-09 17:42:43 +02:00
obscuren 0636e17dbe Added default registrar 2015-04-09 16:37:04 +02:00
obscuren c6b25a4046 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2015-04-09 13:24:08 +02:00
obscuren 8d059e54f1 Updated xeth logger 2015-04-09 11:49:14 +02:00
Jeffrey Wilcke 558683d10c Merge pull request #678 from bas-vk/feature_635
Support for import/export hex encoded keys
2015-04-09 11:31:44 +02:00
Jeffrey Wilcke 79cc3cc98e Merge pull request #671 from bas-vk/issue_567
Add path expansion support for command line arguments, closes 567
2015-04-09 11:31:04 +02:00
Bas van Kervel 6da5b2fc5f reformat code with goimports 2015-04-09 10:26:26 +02:00
Bas van Kervel b3a3fdf9a4 Support for import/export hex encoded keys, closes #635 2015-04-08 23:03:47 +02:00
obscuren 6e2f78ebdd Default log to stderr 2015-04-08 22:18:16 +02:00
obscuren a7750c929b Fixed tests to reflect log changes 2015-04-08 20:45:39 +02:00
obscuren f08e9cbe42 ignore invalid txs right after being added if they prove incorrect 2015-04-08 18:08:21 +02:00
Bas van Kervel 5304f43067 Add path expansion support for command line arguments, closes 567 2015-04-08 15:43:55 +02:00
obscuren 50aa1f178c updated logging 2015-04-07 14:57:16 +02:00
obscuren 688d118c7e Updated logging 2015-04-07 14:57:04 +02:00
obscuren 9c55576c7b Block header changed & console miner control
* miner control moved to `admin.miner`
* miner option to set extra data
* block extra now bytes
2015-04-05 18:59:18 +02:00
obscuren 69ece747d3 v bump 2015-04-05 15:15:19 +02:00
obscuren 01e1b49831 reflect ethash changes 2015-04-05 15:15:05 +02:00
obscuren 50edd4243e removed hash rate from info log. Added hashrate js func 2015-04-05 13:05:10 +02:00
obscuren 5dc5e66986 set backtrace during runtime 2015-04-04 22:16:29 +02:00
obscuren f9488cb763 bumped version number 2015-04-04 16:41:12 +02:00
obscuren c20d04ca67 added verbosity to js admin 2015-04-04 13:24:19 +02:00
obscuren a0e44e3281 basic glog 2015-04-04 12:40:11 +02:00
obscuren 60e097a5f4 Merge branch 'develop' into glog 2015-04-04 12:24:59 +02:00
obscuren bc5528b165 version bump 2015-04-03 17:49:33 +02:00
obscuren 36452afd4e glog wip 2015-04-03 17:09:11 +02:00
obscuren c59c826ab4 fixed stack level 2015-04-03 11:27:56 +02:00
obscuren 4415a5bc68 updated coin 2015-04-03 10:50:07 +02:00
obscuren 79828531b1 updated ethereum.js 2015-04-02 13:13:11 +02:00
obscuren 3f4c1aaf01 info => debug 2015-04-02 12:58:17 +02:00
Jeffrey Wilcke 720d978e35 Merge pull request #589 from tgerring/corssetting
Configurable CORS domain
2015-04-01 12:38:29 +02:00
obscuren 4e8f8cfab7 ethereum.js update 2015-04-01 11:51:05 +02:00
obscuren f468364e4d fixed tests 2015-04-01 11:42:02 +02:00
obscuren 0a554a1f27 Blocktest fixed, Execution fixed
* Added new CreateAccount method which properly overwrites previous
  accounts (excluding balance)
* Fixed block tests (100% success)
2015-04-01 10:53:32 +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 24fc1f073d Add flag to control CORS header #394
* Disabled on CLI
* http://localhost on Mist
2015-03-29 21:21:14 +02:00
obscuren eb102bf4bb Etherbase => etherbase 2015-03-27 12:14:00 +01:00
Jeffrey Wilcke 0b4b2b81f9 Merge pull request #580 from ethersphere/frontier/cli-key
settable etherbase
2015-03-27 12:12:05 +01:00
Taylor Gerring e29396b691 Use ExtraDB for storage. Fixes #577 2015-03-27 09:36:18 +01:00
zelig b375bbee5f settable etherbase
- etherbase flag for block reward destination
- coinbase => etherbase
- CLI- eth Config -> eth, xeth -> RPC / Miner
- use primary instead of coinbase as the unlock magic wildcard
- accounts: firstAddr/Coinbase -> Primary
2015-03-26 21:52:22 +00:00
obscuren b0b0939879 renamed ethereum => geth 2015-03-26 21:27:52 +01:00
zelig 7577d12614 max paranoia mode to UNsupport unencrypted keys entirely
- remove account export functionality from CLI
- remove accountExport method,
- remove unencrypted-keys flag from everywhere
- improve documentation
2015-03-26 19:00:18 +00:00
zelig abbdf41560 output error message if unlock address is invalid (fixes the wierd "read /path: is a directory") msg 2015-03-26 19:00:18 +00:00
zelig 11d2ebc06f unlocking coinbase without knowing address
- accounts: remove Manager.getKey
- cli: for -unlock coinbase, use account manager Coinbase()
2015-03-26 19:00:18 +00:00
zelig 4ec38e3932 common: remove WriteFile and ReadAllFile (use ioutil instead) 2015-03-26 19:00:18 +00:00
zelig 23e41a57ad Applying: fix adming js test regression (maybe otto update?) 2015-03-26 19:00:18 +00:00
zelig fee224f075 cli test: fix test newJSRE interactive argument 2015-03-26 19:00:18 +00:00
zelig d1b52efdb5 cli: implement ethereum presale wallet import via cli 2015-03-26 19:00:18 +00:00
zelig 34d5a6c156 cli: help formatting 2015-03-26 19:00:18 +00:00
zelig 1c4c71dcff cli: fix liner not closing (spuriously opened) in noninteractive jsre 2015-03-26 19:00:18 +00:00
zelig fd8d18ec28 unlocking coinbase
- extract accounts.getKey method - if given empty address it retrieves coinbase (first account)
- cli -unlock coinbase will unlock coinbase
2015-03-26 19:00:18 +00:00
zelig c4ea921876 import/export accounts
- cli: add passwordfile flag
- cli: change unlock flag only takes account
- cli: with unlock you are prompted for password or use passfile with password flag
- cli: unlockAccount used in normal client start (run) and accountExport
- cli: getPassword used in accountCreate and accountImport
- accounts: Manager.Import, Manager.Export
- crypto: SaveECDSA (to complement LoadECDSA) to save to file
- crypto: NewKeyFromECDSA added (used in accountImport and New = generated constructor)
2015-03-26 19:00:18 +00:00
obscuren 658204bafc bump 2015-03-26 17:55:30 +01:00
obscuren ace5b5a1bf updated web3.js 2015-03-26 12:06:45 +01:00
obscuren 98f970ba59 Updated example for new ethereum.js 2015-03-26 01:03:14 +01:00
obscuren 88b9bc40d7 Godep issue? 2015-03-26 01:03:03 +01:00
obscuren 221f30c3aa updated ethereum.js 2015-03-25 13:52:45 +01:00
obscuren 8b32f79445 Removed full path 2015-03-25 13:52:23 +01:00
obscuren 6431d088ad bump 2015-03-25 11:54:11 +01:00
obscuren ff44347ea1 fixed test 2015-03-25 10:31:58 +01:00
obscuren c38a3b4cc7 Better error reporting in the console. Updated ethereum.js 2015-03-24 17:49:28 +01:00
obscuren 9de1ad6546 fixed tests 2015-03-24 15:27:05 +01:00
Taylor Gerring 90c710fd26 Merge pull request #552 from ethersphere/jsonlog
Jsonlog
2015-03-23 18:27:06 +01:00
zelig a983a215dc fix ethtest logging 2015-03-23 17:08:49 +00:00
Taylor Gerring 1cf6ca8f10 Add Close() method to EthereumApi
To close the handler for LDB
2015-03-23 17:41:50 +01:00
obscuren 0330077d76 moved state and vm to core 2015-03-23 16:59:09 +01:00
Gustav Simonsson 5d31a475e9 Fix new types for blocktests and comment out non-working log level setter 2015-03-23 16:32:20 +01:00
Gustav Simonsson 60de4d6dd1 gofmt 2015-03-23 16:32:20 +01:00
Gustav Simonsson 08bb472c91 Add validation of post state accounts to block tests 2015-03-23 16:32:20 +01:00
Gustav Simonsson 33c5186fd0 In blocktest cmd, disable network and add RPC flag 2015-03-23 16:32:20 +01:00
Jeffrey Wilcke dbb2af6016 Merge pull request #548 from tgerring/typescleanup
Fix Mist types build errors
2015-03-23 12:12:29 +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 8b1b9fc99d Merge branch 'jsonlog' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlog
Conflicts:
	eth/backend.go
2015-03-22 21:43:36 +01:00
Taylor Gerring d186bf0dfe Fix Mist types build errors 2015-03-22 14:25:33 +01:00
obscuren e349fb9350 bump 2015-03-22 12:20:27 +01:00
obscuren 13781b922a converted to proper types 2015-03-22 12:12:29 +01:00
zelig 78cff9e3a4 independent flag for json structured logging
- logjson flag remove logformat flag
- passed to eth Config
- logsystem not a field of Ethereum
- LogSystem does not need to expose GetLogLevel/SetLogLevel
- message struct just implements more generic LogMsg interface
- LogMsg is a fmt.Stringer with Level()
- jsonMsg ([]byte) implements LogMsg
- remove "raw" systems
- move level logic inside StdLogSystem
- logsystems only print their kind of msg: jsonLogSystem prints jsonMsg, StdLogSystem prints stdMsg
2015-03-22 02:16:54 +00:00
obscuren a7ad9c309b Merge branch 'develop' into conversion 2015-03-21 14:52:42 +01:00
Felix Lange b95ff54632 cmd/blocktest: delete package
Blocktests are now integrated in cmd/ethereum.
2015-03-20 22:46:41 +01:00
zsfelfoldi 8324b683b4 using robertkrimen/otto, godeps updated 2015-03-20 13:22:01 +01:00
obscuren 4f5b362bda %#x => %x 2015-03-20 12:52:03 +01:00
obscuren 91f9f355b2 test 2015-03-20 12:17:57 +01:00
obscuren df5901fdc5 Removed more casts 2015-03-19 22:45:03 +01:00
obscuren b5a71d955c merge 2015-03-19 16:59:13 +01:00
obscuren 93ba3df4ff Removed frontier from version :-( 2015-03-19 15:36:38 +01:00
obscuren ad7e491214 improved test output 2015-03-19 15:04:29 +01:00
obscuren d4e5747d04 Merge branch 'develop' into conversion 2015-03-19 14:31:41 +01:00
obscuren d7ab716eea Fixed mkdnode & added some tests 2015-03-19 10:57:02 +01:00
obscuren f0bb136099 Merge branch 'develop' into conversion 2015-03-18 18:42:01 +01:00
obscuren 79f90bf7c1 added frontier to version 2015-03-18 18:39:24 +01:00