Jaco Greeff
8453dda7ef
Merge branch 'master' into ui-2
...
# Conflicts:
# js/package-lock.json
# js/package.json
# js/src/api/api.js
# js/src/api/local/accounts/accounts.js
# js/src/api/local/localAccountsMiddleware.js
# js/src/api/local/transactions.js
# js/src/api/pubsub/signer/signer.js
# js/src/api/subscriptions/signer.js
# js/src/api/transport/jsonRpcBase.js
# js/src/api/transport/middleware.js
# js/src/api/util/format.js
# js/src/api/util/format.spec.js
# js/src/contracts/abi/index.js
# js/src/contracts/badgereg.js
# js/src/dapps/tokenreg/Application/application.css
# js/src/dapps/tokenreg/Application/application.js
# js/src/modals/CreateWallet/WalletDetails/walletDetails.js
# js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
# js/src/modals/CreateWallet/createWalletStore.js
# js/src/modals/DeployContract/ParametersStep/parametersStep.js
# js/src/modals/DeployContract/deployContract.js
# js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
# js/src/modals/WalletSettings/walletSettings.js
# js/src/redux/providers/certifications/actions.js
# js/src/redux/providers/certifications/middleware.js
# js/src/redux/providers/certifications/reducer.js
# js/src/redux/providers/requestsActions.js
# js/src/redux/providers/tokensActions.js
# js/src/ui/AccountCard/accountCard.css
# js/src/ui/Balance/balance.js
# js/src/ui/Balance/balance.spec.js
# js/src/ui/DappCard/dappCard.js
# js/src/ui/Form/AddressSelect/addressSelect.js
# js/src/ui/Form/AddressSelect/addressSelectStore.js
# js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
# js/src/ui/Form/TypedInput/typedInput.js
# js/src/ui/IdentityIcon/identityIcon.js
# js/src/ui/MethodDecoding/tokenValue.js
# js/src/util/tx.js
# js/src/util/wallets.js
# js/src/util/wallets/consensys-wallet.js
# js/src/util/wallets/foundation-wallet.js
# js/src/views/Account/account.js
# js/src/views/Accounts/List/list.js
# js/src/views/Contract/Queries/inputQuery.js
# js/src/views/Contract/Queries/queries.js
# js/src/views/Contract/contract.js
# js/src/views/Signer/components/SignRequest/signRequest.css
# js/src/views/Signer/components/SignRequest/signRequest.js
# js/src/views/Signer/components/SignRequest/signRequest.spec.js
2017-10-16 12:41:41 +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
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
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
keorn
f0a6b5d401
azure nodes ( #6017 )
2017-07-10 13:05:05 +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
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
434ed1b91c
remove alt_
2017-03-24 15:35:00 +03: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
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
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
Arkadiy Paronyan
cdc525449a
Ropsten fork detection ( #4163 )
2017-01-13 14:28:10 +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
arkpar
ddb242c969
Fixed upgrading keys on the first run
2016-12-19 17:41:55 +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
69eec105a7
Change default back to permissive for now.
2016-12-15 13:40:44 +01:00
