grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,004 Commits 1 Branch 329 Tags 59 MiB
c270599a23
Commit Graph

353 Commits

Author SHA1 Message Date
Marek Kotewicz
c060d9584d
ethabi version 5 (#7723) 
* Refactor updater to use ethabi-derive

* Grumble: do_call type alias

* Empty commit to trigger test re-run

* migration to ethabi-5.0

* migration to ethabi-5.0 in progress

* use ethabi_deriven to generate TransactAcl contract

* use ethabi_deriven to generate Registry contract

* hash-fetch uses ethabi_derive, removed retain cycle from updater, fixed #7720

* node-filter crate uses ethabi_derive to generate peer_set contract interface

* use LruCache in node-filter instead of HashMap

* validator_set engine uses ethabi_derive

* ethcore does not depend on native_contracts

* miner does no depend on native_contracts

* secret_store does not use native_contracts (in progress)

* removed native-contracts

* ethcore and updater does not depend on futures

* updated ethereum-types

* fixed all warnings caused by using new version of ethereum-types

* updated ethabi_derive && ethabi_contract to get rid of warnings

* removed another retain cycle in updater, fixed following minor version on update

* moved contracts out of native_contracts res

* updated ethabi_contract

* fixed failing test

* fixed failing test

* there is no need to create two contracts of the same kind any more

* simplify updater::ReleaseTrack conversion into u8 and add several tests for it

* applied review suggestions

* applied review suggestions
 2018-02-09 09:32:06 +01:00
Afri Schoedon
a487182e92
Add new EF ropstens nodes. (#7824) 
* Add new EF ropstens nodes.

* Fix tests
 2018-02-08 12:38:18 +01:00
Nikolay Volf
0a7cebe316 adjust storage update evm-style (#7812) 2018-02-06 11:57:29 +01:00
Nikolay Volf
fb4582a90e wasmi interpreter (#7796) 2018-02-05 20:59:27 +01:00
Afri Schoedon
0ea1c41573 Update ropsten.json (#7776) 2018-02-01 16:23:46 +00:00
Afri Schoedon
6dec16bb41
Enable byzantium features on non-ethash chains (#7753) 
* Enable byzantium on dev chain

* Enable byzantium on constractor spec

* Enable byzantium on aura specs

* Enable byzantium on tendermint chain spec

* Enable byzantium on null chain spec

* Fix tests

* Fix test
 2018-02-01 13:42:56 +01:00
Alexey
534692cdae [Wasm] memcmp fix and test added (#7590) 
* [Wasm] memcmp fix and test added

* [Wasm] use reqrep_test! macro for memcmp test
 2018-01-17 13:13:17 +04:00
Afri Schoedon
a553485bbd
Update Parity Mainnet Bootnodes (#7476) 
* Update Parity Mainnet Bootnodes

* Replace the Azure HDD bootnodes with the new ones :)
 2018-01-08 15:06:08 +01:00
Afri Schoedon
36e230ee16
Expanse Byzantium update w/ correct metropolis difficulty increment divisor (#7463) 
* Byzantium Update for Expanse

Here the changes go. Hope I didnt miss anything.

* expip2 changes - update duration limit

* Fix missing EXPIP-2 fields

* Format numbers as hex

* Fix compilation errors

* Group expanse chain spec fields together

* Set metropolisDifficultyIncrementDivisor for Expanse

* Revert #7437

* Add Expanse block 900_000 hash checkpoint
 2018-01-05 13:49:07 +01:00
5chdn
27d8befbad
Remove expanse from available chains 2018-01-03 13:24:27 +01:00
Tomasz Drwięga
48a15cecf8
Update bootnodes (#7363) 
* Updating mainnet bootnodes.

* Add additional parity-beta bootnodes.

* Restore old parity bootnodes and update foudation bootnodes
 2017-12-28 15:12:19 +01:00
Nikolay Volf
82340c058a
Wasm runtime update (#7356) 
* call augmented, wasm-tests updated

* fix all call tests

* fix comments
 2017-12-22 21:54:35 +03:00
Marek Kotewicz
53dce9ff98
Merge pull request #7222 from ellaismer/ellaism 
Add Ellaism coin in chain config
 2017-12-19 09:34:21 -04:00
5chdn
4a9a0f6f55
Update kovan boot nodes 2017-12-15 15:29:48 +01:00
5chdn
0a808a1ac2
Improve chainspec formatting 2017-12-15 15:29:09 +01:00
Konstantin
bb1e03e9cb new warp enodes (#7287) 
* new warp enodes

* added one more warp enode; replaced spaces with tabs
 2017-12-15 15:19:06 +01:00
Tomasz Drwięga
c731b5ef62 Update kovan HF block number. (#7259) 2017-12-12 16:03:28 +01:00
Ellaismer
dd0fba96a4 Add registrar for ellaism 
Provided by @5chdn
 2017-12-06 22:46:19 +08:00
Ellaismer
2d3073fc02 Remove compatibility fields to pass chainspec test for Ellaism 2017-12-06 21:01:03 +08:00
Ellaismer
dcf6e1d83d Add basic Elliasm config 2017-12-06 20:46:24 +08:00
Tomasz Drwięga
7e3872fddc Maximum uncle count transition (#7196) 
* Enable delayed maximum_uncle_count activation.

* Fix tests.

* Defer kovan HF.
 2017-12-05 15:57:45 +01:00
Sergey Pepyakin
359b4de3ff WASM Remove blockhash error (#7121) 
* Remove blockhash error

* Update tests.
 2017-11-26 23:18:58 +03:00
Sergey Pepyakin
3716b09b2e Update wasm-tests 2017-11-21 17:03:14 +03:00
Sergey Pepyakin
3d0616c1ae Parse payload from panic 
Impl payload

empty str is none

Update tests

Clean

Update wasm-tests
 2017-11-20 13:09:57 +03:00
Marek Kotewicz
605cd5cd9f
Merge pull request #7006 from paritytech/no-uncles 
Disable uncles by default
 2017-11-15 23:51:49 +01:00
Sergey Pepyakin
bcdfc50a0b pwasm-std update (#7018) 2017-11-13 00:21:15 +03:00
keorn
261c0d5368 no default uncles 2017-11-09 23:56:02 +00:00
NikVolf
bed82e5cc0 elog (events) for wasm runtime 2017-11-05 18:54:35 +03:00
David Dorgan
bdf1e6afcc Revert "Sync parity-ewf with parity" 
This reverts commit f7ba063b22.
 2017-10-24 13:31:58 +01:00
David Dorgan
f7ba063b22 Sync parity-ewf with parity 2017-10-24 12:31:50 +01:00
ia
bbe9d73e9a Add ECIP1017 to Morden config (#6810) 
* Add ECIP1017 setting to Morden config

* Convert spaces to tabs

* Update Morden bootnodes to match Geth
 2017-10-20 12:37:37 +02:00
Arkadiy Paronyan
b0c15497e1 Fixed kovan chain validation (#6758) 
* Fixed kovan chain validation

* Fork detection

* Fixed typo
 2017-10-14 21:59:26 +02:00
arkpar
cc681c623f
Fixed tests after rename 2017-10-10 17:48:37 +02:00
arkpar
7234a7c630
Difficulty tests 2017-10-10 14:51:12 +02:00
Marek Kotewicz
65ca2f9a07 Merge pull request #6660 from paritytech/byzantium-fork 
Byzantium fork block number
 2017-10-09 11:25:49 +02:00
Afri Schoedon
360ecd3728 Add Musicoin and MCIP-3 UBI hardfork. (#6621) 
* Add musicoin chain spec.

* Add musicoin to parity node

* Add musicoin to the wallet

* Add i18n for musicoin

* Align musicoin chain spec with 1.8, ref #6134

* Update musicoin bootnodes

* Prepare MCIP-3 in musicoin chain spec.

* Update musicoin chain spec with contract addresses for MCIP-3

* Extend ethash params by MCIP-3

* Fix musicoin chain spec json

* Use U256 for block rewards.

* Update musicoin registrar

* Fix merge leftovers

* Update musicoin chain spec for latest master

* Bestow MCIP-3 block reward(s).

* Update musicoin registry once and for all

* Align MCIP-3 block reward with go implementation

* Remove mcip3 test chain spec from repository

* Update MCIP-3 block rewards

* Musicoin homestead transition is at 1_150_000

* Expect mcip3 transtion to be properly defined in chain spec.

* Panic handling for mcip to default to regular block rewards if not specified

* Giving mcip3 rewards a useful default value.

* Fix ethjson tests.

* Update musicoin chain spec

* Fix tests 0:)

* Add musicoin mcip3 era test spec.

* Update musicoin chain spec(s)

* Add tests for mcip3 era block rewards

* Fix tests

* Disable byzantium for musicoin

* Pass miner reward to the tracer.

* Allow modifying blockreward in MCIP-3 transition.
 2017-10-08 18:17:59 +02:00
arkpar
07c63c14f3
Byzantium fork block number 2017-10-06 09:47:04 +02:00
Nikolay Volf
4260910db6 WASM Runtime refactoring (#6596) 
* refactoring to new pwasm-std

* pass reference

* remove ref

* missing underscores
 2017-10-04 13:15:59 +02:00
Robert Habermeier
bc167a211b Generalize engine trait (#6591) 
* move common forks and parameters to common params

* port specs over to new format

* fix RPC tests

* parity-machine skeleton

* remove block type

* extract out ethereum-specific methods into EthereumMachine

* beginning to integrate Machine into engines. dealing with stale transitions in Ethash

* initial porting to machine

* move block reward back into engine

* abstract block reward logic

* move last hash and DAO HF logic into machine

* begin making engine function parameters generic

* abstract epoch verifier and ethash block reward logic

* instantiate special ethereummachine for ethash in spec

* optional full verification in verify_block_family

* re-instate tx_filter in a way that works for all engines

* fix warnings

* fix most tests, further generalize engine trait

* uncomment nullengine, get ethcore tests compiling

* fix warnings

* update a bunch of specs

* re-enable engine signer, validator set, and transition handler

* migrate basic_authority engine

* move last hashes into executedblock

* port tendermint

* make all ethcore tests pass

* json-tests compilation

* fix RPC tests: change in gas limit for new block changed PoW hash

* fix minor grumbles

* validate chainspecs

* fix broken import

* fix transaction verification for pre-homestead
 2017-09-26 14:19:08 +02:00
Arkadiy Paronyan
1b6d840ada Ropsten fork (#6533) 2017-09-18 11:12:42 +02:00
Arkadiy Paronyan
25b35ebddd Byzantium updates (#5855) 
* EIP-211 updates

* benchmarks

* blockhash instruction gas cost updated

* More benches

* EIP-684

* EIP-649

* EIP-658

* Updated some tests

* Modexp fixes

* STATICCALL fixes

* Pairing fixes

* More STATICALL fixes

* Use paritytech/bn

* Fixed REVERTing of contract creation

* Fixed more tests

* Fixed more tests

* Blockchain tests

* Enable previously broken tests

* Transition test

* Updated tests

* Fixed modexp reading huge numbers

* Enabled max_code_size test

* Review fixes

* Updated pairing pricing

* missing commas (style)

* Update test.rs

* Small improvements

* eip161abc
 2017-09-15 21:07:54 +02:00
Alexey
79659bdc76 WASM sha3 test (#6512) 
* sha3 test for empty input implemented

* rename sha3-> keccak

* update keccak test. Now it expects input to hash

* fix gas_left in tests
 2017-09-14 19:32:29 +02:00
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