Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Add MCIP-6 Byzyantium transition to Musicoin spec #7841

Merged
merged 9 commits into from
Mar 4, 2018

Conversation

5chdn
Copy link
Contributor

@5chdn 5chdn commented Feb 8, 2018

Byzantium fork for Musicoin at 2_222_222

As per ? https://github.com/Musicoin/MCIPs/blob/master/MCIPS/mcip-6.md

@5chdn 5chdn added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. B0-patch B7-releasenotes 📜 Changes should be mentioned in the release notes of the next minor version release. M2-config 📂 Chain specifications and node configurations. labels Feb 8, 2018
@5chdn 5chdn added this to the 1.10 milestone Feb 8, 2018
@5chdn 5chdn added A0-pleasereview 🤓 Pull request needs code review. A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels Feb 22, 2018
@tomusdrw tomusdrw mentioned this pull request Feb 27, 2018
10 tasks
@5chdn
Copy link
Contributor Author

5chdn commented Feb 28, 2018

So how to test this: Run parity --chain ./ethcore/res/ethereum/mcip6_byz.json

This will connect to a Go client with the same ruleset. If it syncs beyond 42 without error, it should be fine.

@5chdn 5chdn modified the milestones: 1.10, 1.11, 1.12 Mar 1, 2018
@5chdn 5chdn added P2-asap 🌊 No need to stop dead in your tracks, however issue should be addressed as soon as possible. A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 1, 2018
Copy link
Contributor

@andresilva andresilva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! I was able to sync properly beyond the fork block.

@andresilva andresilva merged commit 6623de4 into master Mar 4, 2018
@andresilva
Copy link
Contributor

I was triggered by the inconsistent formatting in all of our JSON files 🤪

@5chdn 5chdn deleted the a5-musicoin-byzantium branch March 5, 2018 10:54
@5chdn
Copy link
Contributor Author

5chdn commented Mar 5, 2018

Yeah, but I don't want to start a tab versus spaces discussion lol. I think 2 spaces are appropriate for JSON.

@andresilva
Copy link
Contributor

I agree with you 😉

5chdn added a commit that referenced this pull request Mar 5, 2018
* Add test chain spec for musicoin byzantium testnet

* Add MCIP-6 Byzyantium transition to Musicoin spec

* Update mcip6_byz.json

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin bootnodes

* Update musicoin.json

* Update musicoin.json

* More bootnodes.
@5chdn 5chdn mentioned this pull request Mar 5, 2018
5chdn added a commit that referenced this pull request Mar 5, 2018
* Add test chain spec for musicoin byzantium testnet

* Add MCIP-6 Byzyantium transition to Musicoin spec

* Update mcip6_byz.json

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin bootnodes

* Update musicoin.json

* Update musicoin.json

* More bootnodes.
@5chdn 5chdn mentioned this pull request Mar 5, 2018
folsen pushed a commit that referenced this pull request Mar 5, 2018
* Add test chain spec for musicoin byzantium testnet

* Add MCIP-6 Byzyantium transition to Musicoin spec

* Update mcip6_byz.json

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin bootnodes

* Update musicoin.json

* Update musicoin.json

* More bootnodes.
debris pushed a commit that referenced this pull request Mar 12, 2018
* Echo back the message hash of a ping in the pong request

* Fixed broken link in README (#8012)

* Fixed broken link in README

* Updated wiki link

* [hardware wallet] sleeping -> pollling (#8018)

* Use polling, enable missing doc warnings & docs

* make try_connect_polling() a free function

* `Client` refactoring (#7038)

* Improves `BestBlock` comment

* Improves `TraceDB` comment

* Improves `journaldb::Algorithm` comment.

Probably the whole enum should be renamed to `Strategy` or something alike.

* Comments some of the `Client`'s fields

* Deglobs client imports

* Fixes comments

* Extracts `import_lock` to `Importer` struct

* Extracts `verifier` to `Importer` struct

* Extracts `block_queue` to `Importer` struct

* Extracts `miner` to `Importer` struct

* Extracts `ancient_verifier` to `Importer` struct

* Extracts `rng` to `Importer` struct

* Extracts `import_old_block` to `Importer` struct

* Adds `Nonce` trait

* Adds `Balance` trait

* Adds `ChainInfo` trait

* Fixes imports for tests using `chain_info` method

* Adds `BlockInfo` trait

* Adds more `ChainInfo` imports

* Adds `BlockInfo` imports

* Adds `ReopenBlock` trait

* Adds `PrepareOpenBlock` trait

* Fixes import in tests

* Adds `CallContract` trait

* Fixes imports in tests using `call_contract` method

* Adds `TransactionInfo` trait

* Adds `RegistryInfo` trait

* Fixes imports in tests using `registry_address` method

* Adds `ScheduleInfo` trait

* Adds `ImportSealedBlock` trait

* Fixes imports in test using `import_sealed_block` method

* Adds `BroadcastProposalBlock` trait

* Migrates `Miner` to static dispatch

* Fixes tests

* Moves `calculate_enacted_retracted` to `Importer`

* Moves import-related methods to `Importer`

* Removes redundant `import_old_block` wrapper

* Extracts `import_block*` into separate trait

* Fixes tests

* Handles `Pending` in `LightFetch`

* Handles `Pending` in filters

* Handles `Pending` in `ParityClient`

* Handles `Pending` in `EthClient`

* Removes `BlockId::Pending`, partly refactors dependent code

* Adds `StateInfo` trait

* Exports `StateOrBlock` and `BlockChain` types from `client` module

* Refactors `balance` RPC using generic API

* Refactors `storage_at` RPC using generic API

* Makes `MinerService::pending_state`'s return type dynamic

* Adds `StateOrBlock` and `BlockChain` types

* Adds impl of `client::BlockChain` for `Client`

* Exports `StateInfo` trait from `client` module

* Missing `self` use

To be fixed up to "Adds impl of `client::BlockChain` for `Client`"

* Adds `number_to_id` and refactors dependent RPC methods

* Refactors `code_at` using generic API

* Adds `StateClient` trait

* Refactors RPC to use `StateClient` trait

* Reverts `client::BlockChain` trait stuff, refactors methods to accept `StateOrBlock`

* Refactors TestClient

* Adds helper function `block_number_to_id`

* Uses `block_number_to_id` instead of local function

* Handles `Pending` in `list_accounts` and `list_storage_keys`

* Attempt to use associated types for state instead of trait objects

* Simplifies `state_at_beginning`

* Extracts `call` and `call_many` into separate trait

* Refactors `build_last_hashes` to accept reference

* Exports `Call` type from the module

* Refactors `call` and `call_many` to accept state and header

* Exports `state_at` in `StateClient`

* Exports `pending_block_header` from `MinerService`

* Refactors RPC `call` method using new API

* Adds missing parentheses

* Refactors `parity::call` to use new call API

* Update .gitlab-ci.yml

fix gitlab lint

* Fixes error handling

* Refactors `traces::call` and `call_many` to use new call API

* Refactors `call_contract`

* Refactors `block_header`

* Refactors internal RPC method `block`

* Moves `estimate_gas` to `Call` trait, refactors parameters

* Refactors `estimate_gas` in RPC

* Refactors `uncle`

* Refactors RPC `transaction`

* Covers missing branches

* Makes it all compile, fixes compiler grumbles

* Adds casts in `blockchain` module

* Fixes `PendingBlock` tests, work on `MinerService`

* Adds test stubs for StateClient and EngineInfo

* Makes `state_db` public

* Adds missing impls for `TestBlockChainClient`

* Adds trait documentation

* Adds missing docs to the `state_db` module

* Fixes trivial compilation errors

* Moves `code_hash` method to a `BlockInfo` trait

* Refactors `Verifier` to be generic over client

* Refactors `TransactionFilter` to be generic over client

* Refactors `Miner` and `Client` to reflect changes in verifier and txfilter API

* Moves `ServiceTransactionChecker` back to `ethcore`

* Fixes trait bounds in `Miner` API

* Fixes `Client`

* Fixes lifetime bound in `FullFamilyParams`

* Adds comments to `FullFamilyParams`

* Fixes imports in `ethcore`

* Fixes BlockNumber handling in `code_at` and `replay_block_transactions`

* fix compile issues

* First step to redundant trait merge

* Fixes compilation error in RPC tests

* Adds mock `State` as a stub for `TestClient`

* Handles `StateOrBlock::State` in `TestBlockChainClient::balance`

* Fixes `transaction_count` RPC

* Fixes `transaction_count`

* Moves `service_transaction.json` to the `contracts` subfolder

* Fixes compilation errors in tests

* Refactors client to use `AccountData`

* Refactors client to use `BlockChain`

* Refactors miner to use aggregate traits

* Adds `SealedBlockImporter` trait

* Refactors miner to use `SealedBlockImporter` trait

* Removes unused imports

* Simplifies `RegistryInfo::registry_address`

* Fixes indentation

* Removes commented out trait bound

* Bump master to 1.11.0 (#8021)

* Bump master to 1.11.0

* Bump price-info

* Bump mac installer version

* Fix gitlab builds

*  Add MCIP-6 Byzyantium transition to Musicoin spec (#7841)

* Add test chain spec for musicoin byzantium testnet

* Add MCIP-6 Byzyantium transition to Musicoin spec

* Update mcip6_byz.json

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin bootnodes

* Update musicoin.json

* Update musicoin.json

* More bootnodes.

* prelude to the block module cleanup (#8025)

* prelude to block cleanup

* fixed tests

* fix cache & snapcraft CI build (#8052)

after successful testing it is necessary to port in a ```beta``` and ```stable```

* Update refs to shell (#8051)

* Abstract devp2p (#8048)

* Rename ethcore-network to ethcore-network-devp2p

* Fix typo

* Extract generic traits into util/network

* Simplify util/network

* Fix devp2p tests

* Remove old feature

* Fix RPC tests

* Change port because testing environment didn't like those ports
tomusdrw pushed a commit that referenced this pull request Mar 14, 2018
* CI: Fix cargo cache (#7968)

* Fix cache

Blocking waiting for file lock on the registry index

* Only clean locked cargo cache on windows

* fixed ethstore sign (#8026)

* fixed parsing ethash seals and verify_block_undordered (#8031)

* fix for verify_block_basic crashing on invalid transaction rlp (#8032)

* fix cache & snapcraft CI build (#8052)

after successful testing it is necessary to port in a ```beta``` and ```stable```

*  Add MCIP-6 Byzyantium transition to Musicoin spec (#7841)

* Add test chain spec for musicoin byzantium testnet

* Add MCIP-6 Byzyantium transition to Musicoin spec

* Update mcip6_byz.json

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin bootnodes

* Update musicoin.json

* Update musicoin.json

* More bootnodes.
tomusdrw pushed a commit that referenced this pull request Mar 14, 2018
* CI: Fix cargo cache (#7968)

* Fix cache

Blocking waiting for file lock on the registry index

* Only clean locked cargo cache on windows

* fixed ethstore sign (#8026)

* fix cache & snapcraft CI build (#8052)

after successful testing it is necessary to port in a ```beta``` and ```stable```

*  Add MCIP-6 Byzyantium transition to Musicoin spec (#7841)

* Add test chain spec for musicoin byzantium testnet

* Add MCIP-6 Byzyantium transition to Musicoin spec

* Update mcip6_byz.json

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin bootnodes

* Update musicoin.json

* Update musicoin.json

* More bootnodes.
seungjlee pushed a commit to seungjlee/parity that referenced this pull request Mar 19, 2018
* Add test chain spec for musicoin byzantium testnet

* Add MCIP-6 Byzyantium transition to Musicoin spec

* Update mcip6_byz.json

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin byzantium block number

* ethcore: update musicoin bootnodes

* Update musicoin.json

* Update musicoin.json

* More bootnodes.
@Serpent6877
Copy link

Parity 1.9.5:

2018-03-27 20:03:47 Imported #2222221 254f<80>�eefe (56 txs, 1.27 Mgas, 19.45 ms, 6.76 KiB)
2018-03-27 20:03:55 60/75 peers 284 MiB chain 530 MiB db 0 bytes queue 50 KiB sync RPC: 0 conn, 14 req/s, 168 µs
2018-03-27 20:04:03 Stage 5 block verification failed for #2222222 (30aa<80>�64d0)
Error: Block(InvalidStateRoot(Mismatch { expected: d199b42b9300724ad167b5cb833ef8c30130b1bea934f2567eb0dd3d726aafa3, found: 03251ca4c49fb78326786a71fa62f201e93ea5b767288b2b4c714d4444cc0731 }))
2018-03-27 20:04:07 Stage 3 block verification failed for #2222222 (1da5<80>�3fa2)
Error: Block(InvalidDifficulty(Mismatch { expected: 9268325972822, found: 9268327021398 }))
2018-03-27 20:04:30 14/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 111 µs
2018-03-27 20:05:05 14/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 175 µs
2018-03-27 20:05:40 17/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 17 req/s, 118 µs
2018-03-27 20:06:15 14/75 peers 284 MiB chain 530 MiB db 0 bytes queue 38 KiB sync RPC: 0 conn, 16 req/s, 143 µs
2018-03-27 20:06:50 14/75 peers 284 MiB chain 530 MiB db 0 bytes queue 49 KiB sync RPC: 0 conn, 16 req/s, 166 µs
2018-03-27 20:07:25 11/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 171 µs
2018-03-27 20:08:00 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 15 req/s, 149 µs
2018-03-27 20:08:35 21/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 184 µs
2018-03-27 20:08:41 Imported #2222222 f86b<80>�a476 (48 txs, 4.47 Mgas, 18.88 ms, 18.61 KiB)
2018-03-27 20:09:10 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 38 KiB sync RPC: 0 conn, 16 req/s, 174 µs
2018-03-27 20:09:30 Imported #2222223 51ef<80>�fd93 (10 txs, 0.24 Mgas, 7.52 ms, 1.66 KiB)
2018-03-27 20:09:45 8/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 183 µs
2018-03-27 20:10:20 8/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 162 µs
2018-03-27 20:10:55 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 162 µs
2018-03-27 20:11:30 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 15 req/s, 148 µs
2018-03-27 20:12:05 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 168 µs
2018-03-27 20:12:40 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 15 req/s, 172 µs
2018-03-27 20:13:15 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 145 µs
2018-03-27 20:13:50 11/75 peers 284 MiB chain 530 MiB db 0 bytes queue 38 KiB sync RPC: 0 conn, 16 req/s, 163 µs
2018-03-27 20:13:50 Imported #2222224 bfb1<80>�8095 (167 txs, 4.62 Mgas, 45.40 ms, 19.70 KiB)
2018-03-27 20:14:25 11/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 179 µs
2018-03-27 20:15:00 10/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 130 µs
2018-03-27 20:15:17 Imported #2222225 bc4a<80>�45cc (0 txs, 0.00 Mgas, 2.70 ms, 0.50 KiB)
2018-03-27 20:15:35 10/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 149 µs
2018-03-27 20:16:10 11/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 15 req/s, 156 µs
2018-03-27 20:16:16 Imported #2222226 3d56<80>�6e9d (6 txs, 3.51 Mgas, 4.75 ms, 13.92 KiB)
2018-03-27 20:16:44 Imported #2222227 040d<80>�a1f1 (132 txs, 2.82 Mgas, 27.67 ms, 15.68 KiB)
2018-03-27 20:16:45 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 16 req/s, 167 µs
2018-03-27 20:17:20 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 152 µs
2018-03-27 20:17:55 9/75 peers 284 MiB chain 530 MiB db 0 bytes queue 37 KiB sync RPC: 0 conn, 16 req/s, 134 µs
2018-03-27 20:18:08 Imported #2222228 c28f<80>�700b (0 txs, 0.00 Mgas, 3.02 ms, 0.50 KiB)
2018-03-27 20:18:30 11/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 150 µs
2018-03-27 20:19:05 10/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 16 req/s, 135 µs
2018-03-27 20:19:40 6/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 155 µs
2018-03-27 20:20:00 Syncing #2222228 c28f<80>�700b 0 blk/s 0 tx/s 0 Mgas/s 0+ 0 Qed #2222101 7/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 146 µs
2018-03-27 20:20:30 Syncing #2222228 c28f<80>�700b 0 blk/s 0 tx/s 0 Mgas/s 0+ 0 Qed #2222101 6/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 157 µs
2018-03-27 20:20:40 Syncing #2222228 c28f<80>�700b 0 blk/s 0 tx/s 0 Mgas/s 0+ 0 Qed #2222101 7/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 147 µs
2018-03-27 20:21:05 Syncing #2222228 c28f<80>�700b 0 blk/s 0 tx/s 0 Mgas/s 0+ 0 Qed #2222101 7/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 16 req/s, 154 µs
2018-03-27 20:21:30 Syncing #2222228 c28f<80>�700b 0 blk/s 0 tx/s 0 Mgas/s 0+ 0 Qed #2222101 6/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 166 µs
2018-03-27 20:22:00 Syncing #2222228 c28f<80>�700b 0 blk/s 0 tx/s 0 Mgas/s 0+ 0 Qed #2222101 7/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 154 µs
2018-03-27 20:22:25 Syncing #2222228 c28f<80>�700b 0 blk/s 0 tx/s 0 Mgas/s 0+ 0 Qed #2222101 6/75 peers 284 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 164 µs
2018-03-27 20:22:50 Syncing #2222228 c28f<80>�700b 0 blk/s 0 tx/s 0 Mgas/s 0+ 0 Qed #2222101 7/75 peers 290 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 130 µs
2018-03-27 20:23:00 Syncing #2222228 c28f<80>�700b 0 blk/s 0 tx/s 0 Mgas/s 0+ 0 Qed #2222101 8/75 peers 300 MiB chain 530 MiB db 0 bytes queue 48 KiB sync RPC: 0 conn, 15 req/s, 134 µs

Continues to just Sync every block. Going to kill the DB and restart.

This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A2-insubstantial 👶 Pull request requires no code review (e.g., a sub-repository hash update). A8-looksgood 🦄 Pull request is reviewed well. B7-releasenotes 📜 Changes should be mentioned in the release notes of the next minor version release. M2-config 📂 Chain specifications and node configurations. P2-asap 🌊 No need to stop dead in your tracks, however issue should be addressed as soon as possible.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants