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

Initial mechanics for 80:20 fee split#2912

Merged
gavofyork merged 23 commits intomasterfrom
gav-80-20
Jul 2, 2019
Merged

Initial mechanics for 80:20 fee split#2912
gavofyork merged 23 commits intomasterfrom
gav-80-20

Conversation

@gavofyork
Copy link
Member

@gavofyork gavofyork commented Jun 19, 2019

Also:

  • Introduce extra functions for Imbalance manipulation;
  • Store treasury pot in an account, letting total issuance account for it;
  • Make parity-codec versions consistent.

TODO:

Also:
- Introduce extra functions for Imbalance manipulation;
- Store treasury pot in an account, letting total issuance account for
  it.
@gavofyork gavofyork added the A3-in_progress Pull request is in progress. No review needed at this stage. label Jun 19, 2019
@gavofyork gavofyork added A0-please_review Pull request needs code review. and removed A4-gotissues A3-in_progress Pull request is in progress. No review needed at this stage. labels Jun 25, 2019
stanislav-tkach and others added 3 commits June 25, 2019 12:03
* Update parity-codec version

* Update grandpa, rhododendron and trie-bench

* Use primitive-types from crates.io

* Bump impl version

* Fix trie-bench version

* Fix lock files

* Fix versions

* Update codec to 4.1
@niklasad1
Copy link
Contributor

@gavofyork This PR contains a lot of unrelated changes probably because parity codec version was reverted.

It is very hard to review, can you fix the unrelated changes?

@rphmeier
Copy link
Contributor

rphmeier commented Jun 26, 2019

Make Author trait work in order to provide funds to the block author. This is blocked on #2918.

You can block on #2941 instead and call <authorship::Module<T>>::author() where T has a dummy FindAuthor implementation rather than a real one

gavofyork and others added 2 commits July 1, 2019 17:08
Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>
@gavofyork
Copy link
Member Author

@niklasad1 should be easier now.

type PositiveImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as system::Trait>::AccountId>>::PositiveImbalance;
type NegativeImbalanceOf<T> = <<T as Trait>::Currency as Currency<<T as system::Trait>::AccountId>>::NegativeImbalance;

const MODULE_ID: ModuleId = ModuleId(*b"py/trsry");
Copy link
Contributor

Choose a reason for hiding this comment

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

what is py?

Copy link
Member Author

Choose a reason for hiding this comment

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

parity

@gavofyork gavofyork merged commit c3f6617 into master Jul 2, 2019
@gavofyork gavofyork deleted the gav-80-20 branch July 2, 2019 09:41
niklasad1 pushed a commit that referenced this pull request Jul 4, 2019
* Initial mechanics for 80:20 fee split

Also:
- Introduce extra functions for Imbalance manipulation;
- Store treasury pot in an account, letting total issuance account for
  it.

* Fix some tests

* Fix some tests

* Minor cleanups

* Update parity-codec version (#2855)

* Update parity-codec version

* Update grandpa, rhododendron and trie-bench

* Use primitive-types from crates.io

* Bump impl version

* Fix trie-bench version

* Fix lock files

* Fix versions

* Update codec to 4.1

* merge fix

* Revert merge

* More reversions

* Remove accidental code

* Update locks

* Bump runtime

* Update locks

* Tweaks and label TODO

* Update srml/treasury/src/lib.rs

Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>

* Update issue number

* Update core/sr-primitives/src/traits.rs

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

* Fix wasm build

* Fix subkey build
MTDK1 pushed a commit to bdevux/substrate that referenced this pull request Jul 10, 2019
* Initial mechanics for 80:20 fee split

Also:
- Introduce extra functions for Imbalance manipulation;
- Store treasury pot in an account, letting total issuance account for
  it.

* Fix some tests

* Fix some tests

* Minor cleanups

* Update parity-codec version (paritytech#2855)

* Update parity-codec version

* Update grandpa, rhododendron and trie-bench

* Use primitive-types from crates.io

* Bump impl version

* Fix trie-bench version

* Fix lock files

* Fix versions

* Update codec to 4.1

* merge fix

* Revert merge

* More reversions

* Remove accidental code

* Update locks

* Bump runtime

* Update locks

* Tweaks and label TODO

* Update srml/treasury/src/lib.rs

Co-Authored-By: DemiMarie-parity <48690212+DemiMarie-parity@users.noreply.github.com>

* Update issue number

* Update core/sr-primitives/src/traits.rs

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

* Fix wasm build

* Fix subkey build
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants