arkpar
e2371632c5
Base dir option
2016-12-15 21:56:45 +01:00
Gav Wood
d455ac4a40
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc
2016-12-15 17:12:18 +01:00
Gav Wood
590428e7f2
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-15 15:12:09 +01:00
Gav Wood
20b2f84d48
Merge pull request #3828 from ethcore/new-dirs
...
New directory structure
2016-12-15 14:34:01 +01:00
Jaco Greeff
054a6a9daf
Merge branch 'master' into check-updates
...
# Conflicts:
# .gitlab-ci.yml
# js/webpack/dev.server.js
2016-12-15 13:52:28 +01:00
Gav Wood
1ea521ea7d
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc
2016-12-15 13:51:22 +01:00
keorn
943efc21bb
add tendermint seal
2016-12-15 13:41:04 +01:00
Gav Wood
69eec105a7
Change default back to permissive for now.
2016-12-15 13:40:44 +01:00
Gav Wood
a74bce2c06
Merge pull request #3759 from ethcore/auth-bft
...
Tendermint Engine
2016-12-15 13:18:15 +01:00
Gav Wood
a660024eac
Merge pull request #3843 from ethcore/auth-round-seal
...
AuthorityRound seal and simplify Generic seal Spec
2016-12-15 13:08:50 +01:00
Gav Wood
bf7fb84937
Don't put sha3s.
2016-12-14 21:59:00 +01:00
Jaco Greeff
2588aea6b2
Merge branch 'master' into check-updates
2016-12-14 14:37:38 +01:00
keorn
f686fa3d6f
update specs and generic conversion
2016-12-14 12:50:32 +01:00
keorn
ae98a56e8b
revert submodule
2016-12-14 11:42:47 +01:00
keorn
e1d83d15b7
bump dev chain
2016-12-14 11:34:19 +01:00
arkpar
be5fefe772
Merge branch 'master' of github.com:ethcore/parity into new-dirs
2016-12-14 00:04:11 +01:00
Igor Artamonov
e61d14d7f7
reuse Morden for Classic Testnet
2016-12-12 19:50:32 +00:00
arkpar
6601fde328
New data paths with upgrade
2016-12-12 16:51:07 +01:00
Igor Artamonov
6742b080f5
use decimals for block numbers in config
2016-12-11 20:38:37 +06:00
Igor Artamonov
4e3c49c809
revert ETC to correct Network ID
2016-12-11 20:34:46 +06:00
Igor Artamonov
aed633d7df
Testnet for Ethereum Classic
2016-12-11 19:25:02 +06:00
Igor Artamonov
7b5bc115e9
EIP-160 configuration for Ethereum Classic
2016-12-11 18:29:40 +06:00
Igor Artamonov
592ff53bab
EIP-155 configuration for Ethereum Classic
2016-12-11 18:28:37 +06:00
Gav Wood
0a494962e4
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-11 02:13:52 +01:00
keorn
f3af0f46be
Merge branch 'master' into auth-bft
2016-12-10 18:14:35 +01:00
arkpar
02c788a403
Network connectivity fixes
2016-12-10 14:20:34 +01:00
Gav Wood
edd5e76050
Merge branch 'consistent-id' into check-updates
2016-12-09 23:12:36 +01:00
arkpar
97f358ced9
AuthorityRound network simulation test
2016-12-09 20:38:06 +01:00
arkpar
ca7406773f
AuthorityRound network simulation test
2016-12-09 19:27:16 +01:00
keorn
6fc943ca6d
Merge branch 'master' into auth-bft
2016-12-05 16:37:35 +00:00
Gav Wood
afe4cc6a05
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-05 07:09:42 -08:00
keorn
db59bd8731
update genesis seal
2016-12-05 14:28:50 +00:00
keorn
c39d504167
Merge branch 'spec-rlp-loading' into auth-bft
2016-12-05 14:11:06 +00:00
keorn
22632e6324
make generic seal take valid rlp
2016-12-05 14:07:31 +00:00
keorn
b30c1d5602
fix tests
2016-12-05 13:24:22 +00:00
keorn
c946ffebf3
Merge branch 'master' into auth-bft
2016-12-05 11:30:11 +00:00
Gav Wood
90a20a217f
Merge branch 'master' into check-updates
2016-12-04 09:01:50 -08:00
keorn
f1542b5612
better genesis seal rlp
2016-12-03 16:19:51 +00:00
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware
2016-12-01 19:43:31 -08:00
keorn
5c0e89ae9a
Merge branch 'master' into auth-bft
2016-11-28 09:50:22 +00:00
Gav Wood
ce3f4911a2
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-27 15:01:17 +01:00
arkpar
ffa123c949
Set default tx price to 0.0025 USD
2016-11-25 15:13:51 +01:00
Gav Wood
d0312b89ad
Update test, fix number. ( #3612 )
2016-11-25 13:03:15 +01:00
Gav Wood
befb0bf2bd
Merge branch 'fix-number' into check-updates
2016-11-25 12:17:58 +01:00
keorn
1692c07ba6
Merge branch 'master' into auth-bft
2016-11-25 10:51:06 +00:00
keorn
da499b0a4a
self contained test proposal
2016-11-24 19:59:08 +00:00
Gav Wood
45017c599a
Update test, fix number.
2016-11-24 19:11:29 +01:00
Gav Wood
735df6c30f
More work.
2016-11-24 17:19:48 +01:00
keorn
a3730b3042
change proposer address
2016-11-24 13:56:27 +00:00
keorn
d5b15d4560
change authorities for testing
2016-11-22 17:15:42 +00:00
keorn
340d377930
Revert "dont keep account provider in miner"
...
This reverts commit 11ccacd6d0
.
2016-11-22 16:05:27 +00:00
Gav Wood
818e54d44e
Merge pull request #3547 from ethcore/fix-flaky-auth
...
Fix flaky test
2016-11-22 00:01:51 +01:00
Jaco Greeff
af0db9f80e
New registry contract address for ropsten ( #3549 )
...
* New registry for ropsten
* Registry address
* Registry with payable modifier
2016-11-21 18:14:23 +01:00
keorn
6e0bd4072b
Merge branch 'master' into auth-bft
2016-11-21 12:17:00 +00:00
keorn
c6db157554
fix flaky test, clean up specs
2016-11-21 12:06:14 +00:00
Arkadiy Paronyan
efd1d9bd0e
Ropsten network ( #3539 )
...
* Ropsten network
* Sorted premine
* Comas
* Removed trailing coma
2016-11-20 16:38:45 +01:00
Konstantin
d870b71636
updated the european warp bootnode addresses ( #3528 )
2016-11-18 19:41:39 +01:00
Tomasz Drwięga
e45fa62ed5
Fixing tests, fixing refreshing precompiled ( #3483 )
...
* Fixing tests, fixing refreshing precompiled
* Commit only js and Cargo.lock
* Moving commands to the right place
* Adding js content as well
2016-11-17 10:58:07 +01:00
GitLab Build Bot
a7574a1108
[ci skip] js-precompiled 20161116-161024
2016-11-16 16:12:55 +00:00
keorn
8ac989cbeb
Merge remote-tracking branch 'parity/master' into bft
2016-11-16 10:29:54 +00:00
Gav Wood
a5c6cc34cf
Merge pull request #3466 from ethcore/hf2-block-num
...
Set HF2 block number
2016-11-16 11:21:59 +08:00
Gav Wood
1daba384cc
Merge pull request #3426 from ethcore/auth-round
...
Authority round consensus engine
2016-11-16 11:18:01 +08:00
arkpar
be4311540d
Set HF block number
2016-11-15 22:04:25 +01:00
Gav Wood
b5704f8056
Update max code size.
2016-11-15 17:58:29 +01:00
Gav Wood
30ea921329
Introduce the actual max code size.
2016-11-15 17:58:28 +01:00
keorn
d19e8c5505
Merge remote-tracking branch 'parity/master' into bft
2016-11-15 10:26:37 +00:00
keorn
ae5ae765a6
Merge branch 'master' into auth-round
2016-11-14 18:04:44 +00:00
keorn
501f6d3f49
Merge branch 'master' into auth-round
2016-11-14 10:08:14 +00:00
keorn
2d4b4cf5c9
revert moves to Spec
2016-11-14 10:04:34 +00:00
GitLab Build Bot
d1848117ef
[ci skip] js-precompiled 20161113-131856
2016-11-13 13:20:20 +00:00
GitLab Build Bot
5a259be290
[ci skip] js-precompiled 20161113-131228
2016-11-13 13:13:54 +00:00
keorn
cc39b24599
update chain name
2016-11-11 18:41:04 +00:00
keorn
4a65394269
change instant spec, update doc
2016-11-11 18:38:44 +00:00
keorn
a719b91b63
move spec constructors to spec
2016-11-11 16:37:44 +00:00
Arkadiy Paronyan
6ffaab15a3
Disarm the HF and add more bootnodes ( #3323 )
...
* Disarm the HF
* More bootnodes
* Updated tests
2016-11-10 11:28:27 +01:00
GitLab Build Bot
29aecc2cff
[ci skip] js-precompiled 20161109-171832
2016-11-09 17:19:59 +00:00
Gav Wood
4712b882e5
New transaction tests ( #3313 )
...
* Add new transaction tests.
* Add new test.
2016-11-09 18:02:24 +01:00
keorn
49f2a72d5d
Merge branch 'master' into auth-round
2016-11-09 10:35:00 +00:00
keorn
ea960f1c27
Merge remote-tracking branch 'parity/master' into bft
2016-11-07 11:34:45 +00:00
Igor Artamonov
2a19c33b8d
delay bomb for Classic (ECIP-1010) ( #3179 )
...
* delay bomb for classic (ECIP-1010)
* formatting fix after core review, rel [e6b5093]
2016-11-04 23:09:23 +01:00
keorn
255ec0c139
Merge branch 'master' into auth-round
2016-11-04 11:35:17 +00:00
Gav Wood
d3de475205
EIPs 155, 160, 161 ( #2976 )
...
* The front-end for each hard-fork, also EIP-160.
* Address EIP161 a/c
* Include EIP-161b
* EIP-161 part d.
* Fix test build.
* Fix one test, add another.
* Fix use of bloom & renaming.
* Initial groundwork for EIP-155
* Fix minor bug.
* Fix all tests finally.
* Rest of EIP-155.
* Add tests for EIP-155 algorithm.
Update transaction tests validation.
* Minor reformat.
* Address grumbles.
* Remove unused code.
* Fix SUICIDE gas mechanism and add consensus tests.
* Remove commented code.
* Set Frontier hardfork block number
* Fix warning.
* Transaction tests,
2016-11-03 22:22:25 +01:00
keorn
7976f46231
Merge branch 'master' into auth-round-no-mocknet
2016-10-28 17:53:23 +01:00
Tomasz Drwięga
956a059a06
Updating bootnodes for ETC ( #2938 )
2016-10-28 16:02:23 +02:00
Arkadiy Paronyan
55efa16e42
More bootnodes ( #2926 )
2016-10-28 12:00:01 +02:00
keorn
3ff26dd544
Merge branch 'master' into auth-round-no-mocknet
2016-10-26 17:50:04 +01:00
Arkadiy Paronyan
f024acd329
More snapshot fixes and optimizations ( #2883 )
...
* More snapshot fixes and optimizations
* db drop
2016-10-26 16:14:13 +02:00
keorn
aa05823afe
Merge remote-tracking branch 'parity/master' into auth-round-no-mocknet
2016-10-24 15:32:30 +01:00
Arkadiy Paronyan
6f7b7638f4
Resolve morden fork ( #2773 )
2016-10-21 19:23:05 +02:00
Arkadiy Paronyan
906dcd7bfe
Block import optimization ( #2748 )
...
* Block import optimization
* whitespace
[ci:none]
2016-10-20 14:49:12 +02:00
Tomasz Drwięga
9869a85ed5
Bumping json tests
2016-10-19 16:31:51 +02:00
Jaco Greeff
57f33c45cc
Update Registry.sol address (mainnet) ( #2713 )
2016-10-19 12:35:56 +02:00
Arkadiy Paronyan
487dfb0208
Snapshot sync part 2 ( #2098 )
...
* Split block downloader into a module
* Snapshot sync progress
* Warp sync CLI option
* Increased snapshot chunk and ping timeouts
* Fixed an issue with delayed writes
* Updated bootnodes
* Don't run pending IO tasks on shutdown
* Optional first_block; removed insert_snapshot_block
* Fixing expect calls
* Fixed stalled sync
* style and docs
* Update block_sync.rs
[ci:skip]
2016-10-18 18:16:00 +02:00
Gav Wood
b5c65e3df5
Fix up ETC EIP-150 transition to 2,500,000. ( #2636 )
2016-10-16 13:44:56 +02:00
keorn
303f922ebd
steps based on unix epoch
2016-10-15 13:55:10 +01:00
Gav Wood
85eeb3ea6e
EIP150.1c ( #2591 )
...
* EIP150.1b first part.
* Add documentation.
[ci:skip]
* Tweak comment
* Fix some tests.
* Fix create
* Add the new EIP150 test. (#2563 )
* Fix create some more.
* Another fix for create.
* Final fixes.
* Enable EIP150 test.
* Revert the costly suicides to respect EIP150.1b.
* Fixups for EIP150.1c
* Update tests.
* Updating tests
* Adding state tests
* Updating tests
* Updating HF block
* Removing flushln [ci:skip]
* Commenting out suicide test
* New tests.
* Switch to EIP tests.
* Rename some stuff, combine transition tests.
* Fix U256 overflows.
* Name cleanups and an effort to fix tests.
* Rename back for clarity.
* Fix non-EIP-150 OOG CALLs
* New transition block number & additional EIP150 tests
* Morden transition block set; Tests updated
* Added missing test
2016-10-15 14:39:15 +02:00
keorn
8ad1582208
enable suicide json test ( #2626 )
2016-10-14 14:28:02 +02:00
keorn
44f42ac7d3
Merge remote-tracking branch 'parity/master' into auth-round-no-mocknet
...
Conflicts:
ethcore/src/state/mod.rs
ethcore/src/tests/mod.rs
2016-10-12 18:39:31 +01:00
keorn
0189096caf
Update json test suite ( #2574 )
...
* update json test suite
* comment out the incomplete test
2016-10-12 10:06:23 +02:00
keorn
1f56588b87
Merge remote-tracking branch 'parity/master' into bft
...
Conflicts:
ethcore/src/client/client.rs
2016-10-05 14:57:14 +01:00