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

v0.6: merge master branch #497

Merged
merged 35 commits into from
Oct 25, 2019
Merged

v0.6: merge master branch #497

merged 35 commits into from
Oct 25, 2019

Conversation

andresilva
Copy link
Contributor

No description provided.

andresilva and others added 30 commits September 24, 2019 15:31
* docs: add security policy

* Update SECURITY.md

Co-Authored-By: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
* update substrate to latest polkadot-master

* fix test runtime
Also fix the weird file structure by making `wasm_executor.rs` ->
`wasm_executor/mod.rs`.
This replicates changes to `Environment`/`Proposer` that are used
internally at Cumulus.
Signed-off-by: yjhmelody <465402634@qq.com>
* change upstream and branch

* Fix build

* remove doc renamings

* Fix tests

* .

* Revert changing fork and branch

* Update Cargo.toml

* Update parachains.rs
* 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

* Fix

* Fix compilation
Signed-off-by: yjhmelody <465402634@qq.com>
* change versioning and tagging of releases
* Pass `client` and `task_executor` to `BuildParachainContext`

* Update `Cargo.lock`
* Update cargo files

* Make it build again.

* Fix build

* revert cargo file

* New lockfile

* Bump.
* Collator node need to register all gossip validators as well

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

* Fix test
* 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

* Fix compilation
* 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
@andresilva andresilva added A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update). A0-please_review Pull request needs code review. labels Oct 25, 2019
@andresilva
Copy link
Contributor Author

After #498 is merged I will redo this branch, afterwards v0.6 and master should be equivalent.

andresilva and others added 2 commits October 25, 2019 12:47
* 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>
@gavofyork gavofyork merged commit 2c8a404 into v0.6 Oct 25, 2019
@gavofyork gavofyork deleted the andre/v0.6-merge-master branch October 25, 2019 10:54
imstar15 pushed a commit to imstar15/polkadot that referenced this pull request Aug 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review. A2-insubstantial Pull request requires no code review (e.g., a sub-repository hash update).
Projects
None yet
Development

Successfully merging this pull request may close these issues.