Re-instate dual-token modifications to `srml/staking`

cennznet / plug-blockchain

PL^G: a framework for building customised blockchains

GNU General Public License v3.0

11 stars 3 forks source link

Re-instate dual-token modifications to `srml/staking` #58

Closed jordy25519 closed 5 years ago

jordy25519 commented 5 years ago

See: https://github.com/cennznet/plug-blockchain/blob/8cce3fb0d401ad20977af47052365e2ccebe8bd1/srml/staking/src/lib.rs#L1113-L1129

cowboy-bebug commented 5 years ago

Regarding the separation of concern (https://github.com/orgs/cennznet/projects/8#card-27890867), is it possible to keep any changes to core / srml in a separate repo or folder? And then have a build.sh or something to copy & replace relevant scripts

jordy25519 commented 5 years ago

I think it will be hard to automate with new changes from upstream and messy diffs it will continue to require a manual merge process. The best outcome is to reduce the surface area / complexity of the merges when they do need to happen which is one of the goals of that issue.

We'll need to keep a changelog of the alterations to our fork in the forseeable future and have an end to end test suite to verify newly integrated upstream changes keep the functionality as expected

cowboy-bebug commented 5 years ago

Yep that sounds good!