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

Changes for substrate#3699 #466

Merged
merged 8 commits into from
Oct 10, 2019
Merged

Changes for substrate#3699 #466

merged 8 commits into from
Oct 10, 2019

Conversation

expenses
Copy link
Contributor

@expenses expenses commented Oct 8, 2019

@parity-cla-bot
Copy link

It looks like @expenses signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

rphmeier
rphmeier previously requested changes Oct 8, 2019
View reviewed changes
Copy link
Contributor

@rphmeier rphmeier left a comment

Choose a reason for hiding this comment

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

should still point to polkadot-master, once we've backported there.

@bkchr
Copy link
Member

bkchr commented Oct 8, 2019

should still point to polkadot-master, once we've backported there.

Yeah, but that can only be done by team members. The current approach is okay, but the tests are still failing. We can update polkadot-master, when the CI is happy here and replace the branch again.

@expenses
Copy link
Contributor Author

expenses commented Oct 9, 2019

Anything I should be doing to fix the failing tests?

@rphmeier
Copy link
Contributor

rphmeier commented Oct 9, 2019

The test is dependent on the random seed, I suppose. What could have changed it here?

@bkchr
Copy link
Member

bkchr commented Oct 9, 2019

Yeah, I would assume the same. So, you would need to look into this please :)

@expenses
Copy link
Contributor Author

expenses commented Oct 9, 2019

Done :^)

@expenses expenses requested a review from rphmeier October 9, 2019 11:31
@bkchr
Copy link
Member

bkchr commented Oct 9, 2019

@expenses I updated the polkadot-master branch in Substrate to your commit. Could you please reset everything back to use this branch? Then we should be good to go.

@bkchr bkchr merged commit f58cb8b into paritytech:master Oct 10, 2019
andresilva pushed a commit that referenced this pull request Oct 23, 2019
@expenses @andresilva
Changes for substrate#3699 (#466)
5b94ee6 
* change upstream and branch

* Fix build

* remove doc renamings

* Fix tests

* .

* Revert changing fork and branch

* Update Cargo.toml

* Update parachains.rs
gavofyork pushed a commit that referenced this pull request Oct 23, 2019
@andresilva @gavofyork
Backports to v0.6 (#493)
1f576dd 
* Fix compilation in wasm (#465)

Also fix the weird file structure by making `wasm_executor.rs` ->
`wasm_executor/mod.rs`.

* Changes for substrate#3699 (#466)

* change upstream and branch

* Fix build

* remove doc renamings

* Fix tests

* .

* Revert changing fork and branch

* Update Cargo.toml

* Update parachains.rs

* wasm_executor: fix wasm signature checker (#471)

Signed-off-by: yjhmelody <465402634@qq.com>

* Update to latest Substrate master (#472)

* Update to latest Substrate master

* Fix

* Fix compilation

* fix var name for post_upward_message (#474)

Signed-off-by: yjhmelody <465402634@qq.com>

* integrate minor weight/fee changes (#482)

* Update cargo files

* Make it build again.

* Fix build

* revert cargo file

* New lockfile

* Bump.

* Update to latest Substrate master (#486)

* Only register one gossip validator for full nodes (#487)

* Support `account_nextIndex` RPC. (#460)

* Use node-rpc extensions to support account_nextIndex.

* Remove todo.

* Update lock.

* Use new srml_system_rpc crate.

* Update to substrate=master

* Update lockfile.

* Update to polkadot-master.

* Apply suggestions from code review

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* Update to latest substrate master (#491)

* update to latest substrate master

* Fix compilation
gavofyork added a commit that referenced this pull request Oct 25, 2019
@andresilva @gavofyork
v0.6: merge master branch (#497)
2c8a404 
* add authority discovery module (#444)

* grandpa: set justification period to 512 blocks (#445)

* lock (#446)

* Kusama CC2 spec (#449)

* update readme for cc2 (#453)

* docs: add security policy (#450)

* docs: add security policy

* Update SECURITY.md

Co-Authored-By: joe petrowski <25483142+joepetrowski@users.noreply.github.com>

* Enable `substrate-session` `std` feature and remove unused traits (#456)

* update (#457)

* Update latest substrate master (#462)

* update substrate to latest polkadot-master

* fix test runtime

* Fix compilation in wasm (#465)

Also fix the weird file structure by making `wasm_executor.rs` ->
`wasm_executor/mod.rs`.

* Make `ParachainContext` take self as mutable (#458)

This replicates changes to `Environment`/`Proposer` that are used
internally at Cumulus.

* wasm_executor: fix wasm signature checker (#471)

Signed-off-by: yjhmelody <465402634@qq.com>

* Changes for substrate#3699 (#466)

* change upstream and branch

* Fix build

* remove doc renamings

* Fix tests

* .

* Revert changing fork and branch

* Update Cargo.toml

* Update parachains.rs

* update branch name in Cargo.lock (#473)

* Introduce Parathreads (runtime) (#341)

* Rest of parathread draft implementation, parachain permissioning.

* Update Substrate

* Update Substrate again

* Integrate weight/fee stuff.

* Council

* Build fixes

* More fixes

* Minor additions

* fix some small errors

* Revert "fix some small errors"

This reverts commit 4fb52c8.

* Merge fix.

* do_swap -> on_swap

* Update depdendency to polkadot-master

* Fix more merge problems

* Some patching of errors

* Fix storage closure

* Actually fix storage. It builds!

* Tests run... but not successfully.

* Add `run_to_block` to get parachains active to start

* More `run_to_block`

* Fix build

* Queue up changes to threads

* Move registration test

* Fix regsiter/deregister test

* Retry queue.

* Minor refactor

* Refactor to avoid heavy storage items

* Make tests pass

* remove para on deregister, add events

* Remove println

* Fix register/deregister parathread test

* fix merge

* Parathread can be activated test

* Test auction

* Add `Debtors` storage item

I considered putting the debtor information in `ParaInfo`, but it did not make sense to me since this information only applies to parathreads, not `paras` in general.

* remove comment code

* Some new tests

* Fixes for removing threads when scheduled. Tests.

* Test progression of threads.

* Test that reschedule queuing works properly.

* Make test slightly more interesting

* whitespace

* Swap works properly.

* Update locks

* Build

* Rename can_swap

* Add test for funds to be correctly returned after a swap

Swap does not seem to have logic which correctly swaps the debtor account to the new parathread.

* Make tests consistant

* Add check that `PendingSwap` is cleaned up

* Update runtime/src/parachains.rs

Co-Authored-By: Robert Habermeier <rphmeier@gmail.com>

* Update runtime/src/registrar.rs

Co-Authored-By: Robert Habermeier <rphmeier@gmail.com>

* Some fixes/suggestions from review

* Docs

* Apply suggestions from code review

Co-Authored-By: Robert Habermeier <rphmeier@gmail.com>
Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com>

* Update network/src/gossip.rs

Co-Authored-By: Robert Habermeier <rphmeier@gmail.com>

* Rename OnSwap

* Add missing `]`

* Rejig ordering semantics, making everything a bit slower but correct.

* Some Fixes to Parathread Compile (#470)

* Some Fixes

* Fix queue_upward_messages

* Change back to const

* Build fixes

* Fix tests

* Update to latest Substrate master (#472)

* Update to latest Substrate master

* Fix

* Fix compilation

* fix var name for post_upward_message (#474)

Signed-off-by: yjhmelody <465402634@qq.com>

* change versioning and tagging of releases (#476)

* change versioning and tagging of releases

* Make `ParaId` constructible from a const context (#483)

* Pass `client` and `task_executor` to `BuildParachainContext` (#484)

* Pass `client` and `task_executor` to `BuildParachainContext`

* Update `Cargo.lock`

* integrate minor weight/fee changes (#482)

* Update cargo files

* Make it build again.

* Fix build

* revert cargo file

* New lockfile

* Bump.

* Update to latest Substrate master (#486)

* Fixes required for Cumulus (#485)

* Collator node need to register all gossip validators as well

* Make sure that parachain authorities are only written once at genesis

* Fix test

* fix dockerfile build - upgrade image base from ubuntu 16 to 18 (#423)

* Only register one gossip validator for full nodes (#487)

* ci: fix publishing of ci builds (#488)

* Support `account_nextIndex` RPC. (#460)

* Use node-rpc extensions to support account_nextIndex.

* Remove todo.

* Update lock.

* Use new srml_system_rpc crate.

* Update to substrate=master

* Update lockfile.

* Update to polkadot-master.

* Apply suggestions from code review

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* Update to latest substrate master (#491)

* update to latest substrate master

* Fix compilation

* Switch elections to Phragmen, enable them in PoA (#492)

* Switch elections to Phragmen, enable them in PoA

* Remove superfluous code.

* Build fixes

* Update to substrate master

* Build fixes

* Add warning

* Disable authority discovery for now

* Remove commented code

* Fix warning

* service: cleanup task spawning (#495)

* Update to latest substrate polkadot-master (#496)

* update to latest substrate polkadot-master

* Bump to 0.6.3

* service: don't use the grandpa observer (#494) (#498)

* service: don't use the grandpa observer

* service: remove unnecessary boxing

* service: fix indentation

* service: remove unnecessary on_exit

tasks spawned with `spawn_task`/`spawn_essential_task` are already
guarded by `on_exit`.

* Update service/src/lib.rs

Co-Authored-By: Gavin Wood <gavin@parity.io>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bkchr bkchr bkchr approved these changes

@rphmeier rphmeier Awaiting requested review from rphmeier

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@expenses @parity-cla-bot @bkchr @rphmeier