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

integrate minor weight/fee changes #482

Merged
merged 6 commits into from
Oct 19, 2019
Merged

integrate minor weight/fee changes #482

merged 6 commits into from
Oct 19, 2019

Conversation

kianenigma
Copy link
Contributor

integrate changes from paritytech/substrate#3816

@parity-cla-bot
Copy link

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

Many thanks,

Parity Technologies CLA Bot

@kianenigma kianenigma mentioned this pull request Oct 16, 2019
Merged
2 tasks
@kianenigma kianenigma added the A0-please_review Pull request needs code review. label Oct 16, 2019
gui1117
gui1117 reviewed Oct 17, 2019
View reviewed changes
Copy link
Contributor

@gui1117 gui1117 left a comment

Choose a reason for hiding this comment

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

I approve (after revert of branch rename)

@kianenigma
Copy link
Contributor Author

good to be merged to my understanding

@gui1117
Copy link
Contributor

gui1117 commented Oct 17, 2019

I think we should bump spec version as well

@kianenigma
Copy link
Contributor Author

hmm I am not sure how that works here. Same logic as in susbtrate? in that case yes, the substrate PR also updated it as the runtime logic changes and new modules are added.

@bkchr bkchr merged commit 4434b3a into master Oct 19, 2019
@bkchr bkchr deleted the kiz-integrate-new-weight-stuff branch October 19, 2019 13:03
andresilva pushed a commit that referenced this pull request Oct 23, 2019
@kianenigma @andresilva
integrate minor weight/fee changes (#482)
b75eba0 
* Update cargo files

* Make it build again.

* Fix build

* revert cargo file

* New lockfile

* Bump.
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>
tomusdrw pushed a commit that referenced this pull request Mar 26, 2021
@svyatonik
verify messages delivery proofs (#482)
664441d
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bkchr bkchr bkchr approved these changes

@gui1117 gui1117 Awaiting requested review from gui1117

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review.
Projects
None yet
Milestone
No milestone
Development

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