Nikolay Volf
ee14a3fb31
WASM runtime update ( #6467 )
...
* refactor to new parity-wasm
* more errors refactoring
* final test
* update tests
* fix merge bugs
2017-09-10 18:02:31 +02:00
Gav Wood
50495c6898
Merge branch 'master' into Fix-4858
2017-08-29 15:11:05 +02:00
Nikolay Volf
abecd80f54
Wasm math tests extended ( #6354 )
...
* extend math tests
* use latest wasm-tests
* cleanup
* avoid overflow
* use correct gas-
* and division
2017-08-28 14:12:40 +02:00
Nikolay Volf
9e4c122cf3
WASM math test ( #6305 )
...
* wasm tests initial
* fix bug in bitswap
2017-08-20 12:02:59 +08:00
Nikolay Volf
4ab607d4de
wasm-std refactoring ( #6278 )
2017-08-14 12:33:52 +03:00
Alexey
d209100a60
Wasm storage read test ( #6255 )
...
* Test for read from prepopulated storage implemented
* wasm-tests submodule update
* fix identation
* comment for storage_read added
2017-08-09 10:57:54 +02:00
Anton Gavrilov
01a02a8985
Wasm test link changed
2017-08-02 19:02:01 +02:00
Anton Gavrilov
01ea968d4f
Merge with master
2017-08-02 17:24:34 +02:00
Anton Gavrilov
2e840bc89c
Fixed comments after the review
2017-08-02 17:10:06 +02:00
Marek Kotewicz
0c7c34e609
Chainspec validation ( #6197 )
...
* chainspec validation
* better error formatting for chainspec
* lint validate_chainspecs.sh
* quit takes &str instead of S: AsRef<str>
* push CI
* don't double check spec validity
2017-08-02 12:50:36 +02:00
Marek Kotewicz
c4025622de
Merge pull request #6177 from paritytech/wasm-realloc-test
...
Realloc test added
2017-08-01 11:04:59 +02:00
Anton Gavrilov
141c2fd34a
Fixed comments after review and test after rebase
2017-07-31 18:10:06 +02:00
fro
fe6bdc870c
realloc test contract submodule update
2017-07-31 16:54:26 +03:00
Anton Gavrilov
e8095826bf
Tabs corrected
2017-07-31 13:42:40 +02:00
Anton Gavrilov
5086dc3024
Working test with block reward added
2017-07-31 13:42:34 +02:00
Robert Habermeier
003eef982b
Move more params to the common section. ( #6134 )
...
* move common forks and parameters to common params
* port specs over to new format
* fix RPC tests
2017-07-31 12:34:29 +02:00
arkpar
9ad0ff960e
Place RETURNDATA behind block number gate
2017-07-19 14:34:59 +02:00
Nikolay Volf
62210fb932
WASM contracts MVP ( #5679 )
...
* lifetime issues
* refactor to new 'native env'
* descriptors and such
* wasm mvp continued
* finalized env/ext bindings
* descriptor -> call_args
* inject gas counter
* result processing and engine activation
* tabify some source files
* needs return new
* wasm tests initial
* erradicate warnings
* origin in the descriptor
* update test repo
* payload verification tests
* identity return payload test
* some test description
* dispersion test
* check length here
* suicidal contract
* engine params
* fix typo
* review fixes
* submodule update
* update - purge reserved space
* doc effort
* more review fixes
* fix error message
* fix dependency url
* reorg error handling
* update submodule
* update utils
* update to latest parity-wasm
* tabify
* fix wasm magic header
* update dependencies
* external create and tests
* update to latest tests
* extra trace info
* Update parity-wasm
* update wasm-utils also
* few traces and result handle change
* alter trace content
* fix issues with optimizer, update to latest parity with validator, etc
* static initialization
* license preamble
* update wasm crates and gas costs
* fix grumbles
* bring back lifetime
* fix compilation
2017-07-10 17:42:10 +02:00
keorn
f0a6b5d401
azure nodes ( #6017 )
2017-07-10 13:05:05 +02:00
Robert Habermeier
d069b98b45
PoA: Wait for transition finality before applying ( #5774 )
...
* final engine changes
* migration to v13
* adding and removing pending transitions
* epoch_transition_for
* port snapshot to new engine methods
* final validator set interface
* fix compiler errors
* revert v13/epoch_depth transition
* make call on new epoch
* rolling finality checker
* tests for finality checker
* constructing finality proof upon pending transition
* fix warnings and finality proof checking
* fix compiler warnings in tests
* test fixes
* don't include genesis in finality checking
* change snapshot test chain building logic
* minor refactorings
* fetch epoch transition based on parent, fix divide-by-zero in SimpleList
* fix formatting
* fix ABIs and finality checking in snapshot restoration
* encode signal number in proof
* create more blocks at the end of tests
* update gist to accurate contract code
* test for epoch_transition_for
* fix tests with immediateTransitions parameter
* disable force flag after forcing
* rename ValidatorsChanged to InitiateChange and finalizeSignal to finalizeChange
* a few more validator set tests
2017-06-28 13:17:36 +02:00
Stewart Mackenzie
d152fa3e85
Ethereum Classic Monetary Policy ( #5741 )
...
* Ethereum Classic Monetary Policy
Create a new parameter `ecip1017EraRounds`. When the block number
passes one era rounds, the reward is reduced by 20%.
See https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1017.md
* Update rewards for uncle miners for ECIP1017
In the monetary policy, the rewards are changed from "up to 7/8 of the
reward" to "1/32 of the reward".
* Fix an off-by-one error in ECIP1017 era calculation
According to
https://github.com/ethereumproject/ECIPs/blob/master/ECIPs/ECIP-1017.md ,
when in block number 5,000,000, it should still be in Era 1 (which in
our code `era == 0`). So we need to check whether the `rem` equals to
zero and act accordingly when calculating the era.
* `ecip1017_era_rounds` missing from EthashParams when run in build bot
* strip out ecip1017_eras_block_reward function and add unit test
2017-06-19 18:56:37 +02:00
Marek Kotewicz
575c51f5a0
eip214, #4833 ( #4851 )
2017-06-19 11:41:46 +02:00
Arkadiy Paronyan
e6a31e7543
EIP-210 BLOCKHASH changes ( #5505 )
...
* EIP-210
* comment
2017-05-30 11:52:33 +02:00
Arkadiy Paronyan
dd004aba9f
EIP-140 ( #5477 )
2017-05-23 16:49:17 +03:00
keorn
945c1a9478
add monotonic transition to kovan ( #5587 )
2017-05-15 21:34:01 +01:00
keorn
a3d9cce7c5
Pass additional data when reporting ( #5527 )
...
* pass additional data when reporting
* checkout correct tests
2017-05-03 09:01:24 +02:00
Robert Habermeier
0768ce3600
Merge pull request #5307 from paritytech/eip-212
...
EIP-212 (bn128 curve pairing)
2017-04-21 13:10:57 +02:00
Arkadiy Paronyan
b50fb71dd1
EIP-86 ( #4697 )
...
* EIP-86
* Disable EIP-86 auto activation for now
2017-04-19 14:30:00 +02:00
Arkadiy Paronyan
15ae24b541
New state tests ( #5418 )
...
* General state tests
* Allow dir name for a test
2017-04-12 13:33:49 +02:00
Christopher Franko
41700a6996
Update expanse json with fork at block 600000 ( #5351 )
...
* Update expanse json with fork at block 600000
* update exp chainID to 2
2017-04-03 09:59:08 +02:00
keorn
84abf5d84f
Aura eip155 validation transition ( #5362 )
...
* add eip155 validation
* add transition block
2017-04-01 13:21:22 +02:00
NikVolf
d34aec29ed
finalize
2017-03-31 17:38:30 +03:00
Robert Habermeier
d146ae7275
Merge pull request #4999 from paritytech/eip-213
...
EIP-213 (bn128 curve operations)
2017-03-31 14:54:07 +02:00
Jan Ziniewicz
5d6dac495e
Add new seed nodes ( #5345 )
2017-03-30 14:49:11 +02:00
Arkadiy Paronyan
c7d99c37fb
Ropsten revival ( #5302 )
2017-03-28 10:47:21 +02:00
keorn
a61b1567d0
Strict validation transitions ( #4988 )
...
* ability to make validation stricter
* fix consensus
* remove logger
2017-03-28 10:46:52 +02:00
NikVolf
efe0f8449c
Merge remote-tracking branch 'origin/master' into eip-213
2017-03-27 18:18:22 +03:00
NikVolf
434ed1b91c
remove alt_
2017-03-24 15:35:00 +03:00
keorn
9fdd0e3a0a
Switching ValidatorSet ( #4961 )
...
* add multi validator set
* nicer comment
* validate in constructor
* reporting
2017-03-23 13:19:28 +01:00
NikVolf
5e34235a36
initial, fallable built-ins
2017-03-22 04:01:46 +03:00
Robert Habermeier
797a3e1cd9
EIP198 and built-in activation ( #4926 )
...
* EIP198 and built-in activation
* address review
2017-03-21 19:36:38 +03:00
Arkadiy Paronyan
43871e393c
Additional kovan params ( #4892 )
2017-03-14 11:41:56 +01:00
Arkadiy Paronyan
e0d554e0ca
Recalculate receipt roots in close_and_lock ( #4884 )
2017-03-13 17:47:43 +01:00
keorn
98be191b25
Fix validator contract syncing ( #4789 )
...
* make validator set aware of various states
* fix updater build
* clean up contract call
* failing sync test
* adjust tests
* nicer indent [ci skip]
* revert bound divisor
2017-03-08 14:41:24 +01:00
Igor Artamonov
63bc942e41
update ETC bootnodes ( #4794 )
2017-03-07 05:34:48 +01:00
Jaco Greeff
495e5790e9
Support both V1 & V2 DataChanged events in registry ( #4734 )
...
* Add info on forks.
* Add new registry ABI
* Import registry2 & fix exports
* Select ABI based on code hash
* Render new event types (owner not available)
* New registry.
* Rename old chain.
* Fix test.
* Another fix.
* Finish rename.
2017-03-03 13:33:49 +01:00
Gav
40526c5270
Merge remote-tracking branch 'origin/master' into new-chains
2017-03-02 23:49:24 +01:00
Gav
71d3fa8707
Add registry.
2017-03-02 23:47:56 +01:00
Gav Wood
2862b3c21a
New chains ( #4720 )
...
* Add Kovan chain.
* Fix up --testnet.
* Fix tests.
* Fix test.
* fix test
* Fix test.
2017-03-02 20:24:27 +01:00
Gav
c662d1cb0a
Add Kovan chain.
2017-03-02 14:33:59 +01:00
keorn
ade5a13f5b
Add registrar fields ( #4716 )
...
* add registrar field
* use constructor for dev registrar
* fix test
2017-03-02 12:25:55 +01:00
keorn
76c39e3e66
Fix lock and rename tracing ( #4403 )
...
* tracing, timeouts
* remove env_logger
2017-02-02 19:11:43 +01:00
Arkadiy Paronyan
c012dfc3ef
EIP-98: Optional transaction state root ( #4296 )
...
* EIP98: Optional receipt state root
* Use if-else
* Fixing tests
2017-01-25 20:22:48 +01:00
Konstantin
9d0278e0f8
added 3 warpnodes for ropsten ( #4289 )
...
* added 3 warpnodes for ropsten
* Fixed indentation
2017-01-24 14:35:52 +01:00
keorn
ba0209678b
ValidatorSet reporting ( #4208 )
...
* remove register_account_provider
* build rpc module
* new dummy client
* common EngineSigner struct
* from -> into
* initial report via call
* separate safe from regular contract
* transact_contract
* fix build
* return Signature, docs
* add sign method to some engines
* add safeContract spec
* update specs to new contracts
* use AuthorityRound for contract spec
* add more reporting
* add reporting test
* use gas floor
* shorter
2017-01-24 12:03:58 +03:00
Arkadiy Paronyan
cdc525449a
Ropsten fork detection ( #4163 )
2017-01-13 14:28:10 +01:00
keorn
be30c44179
Validator/authority contract ( #3937 )
...
* dir
* simple validator list
* stub validator contract
* make the engine hold Weak<Client> instead of IoChannel
* validator set factory
* register weak client with ValidatorContract
* check chain security
* add address array to generator
* register provider contract
* update validator set on notify
* add validator contract spec
* simple list test
* split update and contract test
* contract change
* use client in tendermint
* fix deadlock
* step duration in params
* adapt tendermint tests
* add storage fields to test spec
* constructor spec
* execute under wrong address
* create under correct address
* revert
* validator contract constructor
* move genesis block lookup
* add removal ability to contract
* validator contract adding validators
* fix basic authority
* validator changing test
* more docs
* update sync tests
* remove env_logger
* another env_logger
* cameltoe
* hold EngineClient instead of Client
* add a comment about lock scope
2017-01-10 12:23:59 +01:00
keorn
afc4cd2785
Allow contract constructors in chain spec ( #3932 )
...
* constructor spec
* execute under wrong address
* create under correct address
* revert
* move genesis block lookup
* remove env_logger
2016-12-23 18:44:39 +01:00
Igor Artamonov
be75cbfaaa
set CHAIN_ID for Classic ( #3934 )
...
* configurable CHAIN_ID
* set CHAIN_ID for Ethereum Classic
2016-12-22 13:10:58 +01:00
Gav Wood
cd8af0a497
Merge pull request #3904 from ethcore/new-dirs
...
Fixed upgrading keys on the first run
2016-12-19 22:24:37 +01:00
arkpar
ddb242c969
Fixed upgrading keys on the first run
2016-12-19 17:41:55 +01:00
keorn
46662899da
make spec naming consistent
2016-12-19 14:15:39 +01:00
Gav Wood
b89d10239b
Update tests, gitlabci
2016-12-16 15:12:35 +01:00
Gav Wood
72f278efed
Merge pull request #3868 from ethcore/new-dirs
...
Base directory option
2016-12-16 13:04:31 +01:00
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