Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/1204080823207081 staking collect mechanism #114

Closed
wants to merge 197 commits into from
Closed

Feature/1204080823207081 staking collect mechanism #114

Show file tree
Hide file tree
Changes from 122 commits
Commits
Show all changes
197 commits
Select commit Hold shift + click to select a range
d1c6e74
updated Cargo.toml
neutrinoks Mar 2, 2023
1b62a85
first raw integration
neutrinoks Mar 2, 2023
c98c6ec
Merge branch 'parachain_dev' into staking-collect-try1
neutrinoks Mar 10, 2023
1eef71b
saving state, before new try
neutrinoks Mar 14, 2023
cee8593
compiling, but not ready
neutrinoks Mar 14, 2023
ea197c8
survey about staking mechanism
neutrinoks Mar 14, 2023
f4cbed7
save current status, until discussion
neutrinoks Mar 15, 2023
033c6c9
workarround solution implemented
neutrinoks Mar 21, 2023
4a7a5dc
start preparing unittest adaption
neutrinoks Mar 21, 2023
2899f6a
Merge branch 'parachain_dev' into feature/1204080823207081_staking-co…
neutrinoks Mar 21, 2023
f45f83d
new functionality in test mockup
neutrinoks Mar 21, 2023
cd1d754
49/54 tests are passing again
neutrinoks Mar 22, 2023
b4e74a1
only one test fails
neutrinoks Mar 23, 2023
a4c72cb
regular tests are working
neutrinoks Mar 23, 2023
db0fe0f
start improving and preparing more tests
neutrinoks Mar 23, 2023
5fcff30
compilation test with dev runtime
neutrinoks Mar 23, 2023
e2035a8
adapted other runtimes as well
neutrinoks Mar 23, 2023
8df9aa4
removed obsolete stuff and comments
neutrinoks Mar 23, 2023
240752f
update Cargo.lock
neutrinoks Mar 24, 2023
bc7262c
added new test for different claim of rewards
neutrinoks Mar 24, 2023
5f2ad90
improved test support methods
neutrinoks Mar 24, 2023
43d949f
new test
neutrinoks Mar 24, 2023
f09adaa
cargo fmt
neutrinoks Mar 24, 2023
509d53a
proper integration of new parachain-staking
neutrinoks Mar 24, 2023
fef1546
cleanup of comments, fmt etc.
neutrinoks Mar 27, 2023
59b7ae9
Merge branch 'parachain_dev' into feature/1204080823207081_staking-co…
neutrinoks Mar 27, 2023
7576fb9
added new test
neutrinoks Mar 27, 2023
7eb77e8
undo individual changes
neutrinoks Mar 27, 2023
bd2a0b6
improved token flow, added new test
neutrinoks Mar 28, 2023
00938ad
added new tests again, prepare removing avg-block-factor
neutrinoks Mar 28, 2023
b26b191
removed avg-block-factor
neutrinoks Mar 28, 2023
caa9e8c
cleanup of test methods, removed comments
neutrinoks Mar 28, 2023
539d9f3
correct new storage version
neutrinoks Mar 29, 2023
ecd1714
added new sudo reset-average-rewards
neutrinoks Apr 4, 2023
a5eac95
update manifest and rebuild
neutrinoks Apr 4, 2023
00f8cbf
name change in getter method
neutrinoks Apr 4, 2023
b05b672
added new unittest
neutrinoks Apr 4, 2023
ff14bf2
improved test, bugfix & prepared default-weights
neutrinoks Apr 5, 2023
9e0d292
fix in test
neutrinoks Apr 5, 2023
d0e86eb
integrated OnUnbalanced trait into pallet
neutrinoks Apr 6, 2023
5b3af0a
removed comment
neutrinoks Apr 6, 2023
a2def68
adaptions in runtime, parachain-staking pallet
neutrinoks Apr 6, 2023
cb6ef3e
block-reward pallet, only one on_unbalanced call
neutrinoks Apr 6, 2023
cd78ef3
flag for reset of average-block-reward
neutrinoks Apr 6, 2023
a0d8fc0
merged with parachain_dev
neutrinoks Apr 11, 2023
9aefe26
cargo update after merging parachain_dev
neutrinoks Apr 12, 2023
55fde12
trying to modify test's starting block to 1
neutrinoks Apr 14, 2023
98170b4
bugfix in block-reward pallet
neutrinoks Apr 15, 2023
e2031b3
after bugfix this is working, tests have to be adapted again
neutrinoks Apr 15, 2023
857eb98
fixed tests to new hooks
neutrinoks Apr 17, 2023
80ae981
update cargo.lock
neutrinoks Apr 17, 2023
b0e6a7e
Merge branch 'parachain_dev' into feature/1204080823207081_staking-co…
neutrinoks Apr 17, 2023
f4b3554
weighted average-block-reward
neutrinoks Apr 17, 2023
bc0299a
removed debug-log
neutrinoks Apr 17, 2023
d1ea5fb
update config and solving version conflict scale-info
neutrinoks Apr 19, 2023
885d202
Merge branch 'parachain_dev' into feature/1204080823207081_staking-co…
neutrinoks Apr 19, 2023
4e8d2d0
Merge branch 'parachain_dev' into feature/1204080823207081_staking-co…
neutrinoks Apr 20, 2023
25329ad
switching to previous toolchain
neutrinoks Apr 20, 2023
932c068
migration prepared, types defined, now start to refine
neutrinoks Apr 21, 2023
b15ea44
draft implementation for integrated DiscreteAveraging
neutrinoks Apr 24, 2023
477227a
configurable averaging function
neutrinoks Apr 24, 2023
8adbb7a
extrinsic for configuration, rename of storage
neutrinoks Apr 24, 2023
4f184c7
refactored new traits and adapted code
neutrinoks Apr 24, 2023
feb66f5
Merge branch 'parachain_dev' into feature/1204080823207081_average-bl…
neutrinoks Apr 25, 2023
d035a40
removed pub exports
neutrinoks Apr 25, 2023
8b57d11
changed version to v2.2.0
neutrinoks Apr 25, 2023
a4ca3bb
fix in version select
neutrinoks Apr 25, 2023
4a0cc86
changed version
neutrinoks Apr 25, 2023
f8e6046
modifyed traits again to make them fit together
neutrinoks Apr 25, 2023
e7af140
adapting runtime for modified pallets
neutrinoks Apr 25, 2023
faa133e
public exports of important structs
neutrinoks Apr 26, 2023
01817c1
removing temporary files
neutrinoks Apr 26, 2023
b9e86e4
node integration, first compilation
neutrinoks Apr 26, 2023
11cded1
clean up on staking-pallet sourcefiles
neutrinoks Apr 26, 2023
6714905
moved commented code for another avg-function
neutrinoks Apr 26, 2023
b58ccd6
added some documentation for averaging
neutrinoks Apr 27, 2023
76ab305
removed old imports
neutrinoks Apr 27, 2023
e4a1ee3
removed debug-log and obsolete code
neutrinoks Apr 27, 2023
d0ed6c0
bugfix, initial avg-block-reward
neutrinoks Apr 27, 2023
aa50cc4
old tests working again
neutrinoks Apr 27, 2023
ac6f12e
added notes about averaging to doc
neutrinoks Apr 27, 2023
8669217
prepared new test, not ready yet
neutrinoks Apr 27, 2023
bdcb766
start refactoring tests
neutrinoks Apr 28, 2023
ba4c121
moving averaging to separate crate
neutrinoks Apr 28, 2023
331e2a4
use peaq-frame-ext, added mock-pallet
neutrinoks Apr 28, 2023
30532a6
parachain-staking tests are working again
neutrinoks Apr 28, 2023
820d043
maschallah, all tests are working
neutrinoks Apr 29, 2023
7123905
update cargo.lock
neutrinoks Apr 29, 2023
16585ee
cargo fmt
neutrinoks Apr 29, 2023
923553d
current state of compilation
neutrinoks May 2, 2023
7e90a9c
corrected dependencies peaq-frame-ext
neutrinoks May 3, 2023
c93fdd9
crash merge with parachain_dev
neutrinoks Sep 6, 2023
d2f34b8
updated block-reward pallet
neutrinoks Sep 7, 2023
d5f481f
parachain-staking pallet, work in progress
neutrinoks Sep 8, 2023
f0729ad
cleaned PR for parachain-staking pallet and helpers
neutrinoks Sep 18, 2023
09bf20d
rough changes of code for claim-mechanism
neutrinoks Sep 20, 2023
ed5e8fc
fixing in progress
neutrinoks Sep 20, 2023
071ed54
merged parachain_dev, fixed all with newer rustc version
neutrinoks Sep 20, 2023
c7e0ab9
rustc-version, switch to workspace related manifest
neutrinoks Sep 20, 2023
cda72d1
rustc-version, solved lot of dependency warnings
neutrinoks Sep 20, 2023
ce844dc
introduce workspace package informations
neutrinoks Sep 21, 2023
ef3204b
another commit, another error
neutrinoks Sep 21, 2023
78c2196
Solve the build issue
Sep 21, 2023
898adc9
removing last warnings about double type definitions
neutrinoks Sep 21, 2023
63b0ccf
no compilation errors more in tests
neutrinoks Sep 22, 2023
2c7f83f
fixed parachain-staking tests
neutrinoks Sep 26, 2023
dccc957
cargo clippy
neutrinoks Sep 26, 2023
7303f2e
cargo fmt
neutrinoks Sep 26, 2023
f502dc0
Merge branch 'parachain_dev' into feature/1204080823207081_staking-co…
neutrinoks Sep 26, 2023
ccfb723
fixed derive_more issue
neutrinoks Sep 29, 2023
3a6dee2
fixed expand test
neutrinoks Sep 29, 2023
7318ded
fixed ui test, start fixing pallets test
neutrinoks Sep 29, 2023
cb66fc7
fixed more tests
neutrinoks Sep 30, 2023
ca04c81
fixed last tests
neutrinoks Sep 30, 2023
c214435
cargo clippy
neutrinoks Sep 30, 2023
89fe96b
cargo fmt
neutrinoks Sep 30, 2023
34dc8a6
again fixed block-reward, push failed
neutrinoks Oct 2, 2023
e08090e
again clippy and fmt
neutrinoks Oct 2, 2023
5756067
schto na hui bljad
neutrinoks Oct 4, 2023
9fc23a4
doc test now correct, check if cargo fmt will touch it
neutrinoks Oct 4, 2023
2708080
removed example code, because cargo fmt won't stop touching it, bad f…
neutrinoks Oct 4, 2023
2785f38
update github action for new rust version and cargo expand
neutrinoks Oct 4, 2023
bb68b7b
removed cargo-expand from cargo components
neutrinoks Oct 9, 2023
7755c01
cleaner code without crate::mock::
neutrinoks Oct 9, 2023
e5472e8
exchange all dependencies to newer ones
neutrinoks Oct 12, 2023
8c46abf
update rust-toolchain
neutrinoks Oct 12, 2023
0e5c90e
necessary changes for polkadot-v0.9.43
neutrinoks Oct 12, 2023
614df1b
necessary modifications for polkadot-v0.9.43
neutrinoks Oct 12, 2023
bcc3eb9
necessary modifications for polkadot-v0.9.43
neutrinoks Oct 12, 2023
b32a8bf
working on precompiles
neutrinoks Oct 12, 2023
461f9af
more adaptions
neutrinoks Oct 13, 2023
406dd58
peaq runtime is compiling
neutrinoks Oct 13, 2023
117ae1f
runtime modules compiling again
neutrinoks Oct 16, 2023
029e436
fix client
neutrinoks Oct 16, 2023
b2f5c02
fix primitives
neutrinoks Oct 16, 2023
ac37d13
working on node for polkadot v0.9.43
neutrinoks Oct 16, 2023
31c0c70
work in progress
neutrinoks Oct 17, 2023
249c807
more fixes
neutrinoks Oct 18, 2023
e4a4174
improved type declarations and hierarchy to remove warnings
neutrinoks Oct 18, 2023
8f7b125
moved primitives to peaq-primitives-xcm, codec to parity-scale-codec
neutrinoks Oct 18, 2023
cc7ed0e
adding default-feature flag to remove warnings
neutrinoks Oct 18, 2023
00d96bc
work in progress
neutrinoks Oct 18, 2023
573fc83
more fixes
neutrinoks Oct 18, 2023
83a1a2e
Fix the build fail
Oct 19, 2023
783714d
removed warnings, applied cargo clippy and fmt
neutrinoks Oct 30, 2023
c176378
fixing merge conflicts
neutrinoks Oct 30, 2023
de08ecb
fixing errors
neutrinoks Oct 31, 2023
9c4f472
update version strings
neutrinoks Oct 31, 2023
6ba1840
undo ubuntu version
neutrinoks Oct 31, 2023
6d46625
merged polkadot-v0.9.43
neutrinoks Oct 31, 2023
0ea6009
changed path relative dependencies to workspace dependencies
neutrinoks Oct 31, 2023
35efa1b
more dependency changes
neutrinoks Oct 31, 2023
d0b7c4c
fixing tests
neutrinoks Oct 31, 2023
8e63b91
trying to fix precompile-utils macro expand
neutrinoks Oct 31, 2023
27d71ec
update version for github action
neutrinoks Oct 31, 2023
af84052
worked on precompiles, but ignored two tests finally
neutrinoks Nov 2, 2023
5802f61
again clippy, fmt and fix of block-reward doc test
neutrinoks Nov 2, 2023
98238f3
forget to update cargo-expand version in github action
neutrinoks Nov 2, 2023
72c771c
Merge branch 'parachain_dev' into feature/1204080823207081_upgrade_po…
neutrinoks Nov 2, 2023
99a8754
merged polkadot-v0.9.43 branch
neutrinoks Nov 2, 2023
6eccc60
moved all relative internal paths to workspace manifest file
neutrinoks Nov 2, 2023
cb438ff
forgot cargo fmt
neutrinoks Nov 2, 2023
73d08aa
review change requests
neutrinoks Nov 3, 2023
89bb62a
Fix the weight limit exceeds
Nov 3, 2023
d3d9798
no from_all
neutrinoks Nov 3, 2023
2fe4fd4
updated Weight::from_parts again
neutrinoks Nov 7, 2023
786dacf
forget to commit cargo.lock
neutrinoks Nov 7, 2023
89d6b04
Update the precompile due to the call errors
Nov 10, 2023
0196e86
adapted precompile check, moonbeam style
neutrinoks Nov 10, 2023
151e60b
cargo fmt
neutrinoks Nov 10, 2023
574a9c0
cherry picked jays commit from claim-v0.9.43 branch
Nov 10, 2023
fc07dca
fixed manifest files
neutrinoks Nov 10, 2023
18b73a7
clippy and fmt
neutrinoks Nov 10, 2023
bf80de2
Fix the precompile error + add the rough storage info
Nov 11, 2023
9281edb
Fix the weight setup on collective pallet
Nov 11, 2023
96f3130
Fix the precompile error + add the rough storage info
Nov 11, 2023
2f81418
Fix the weight setup on collective pallet
Nov 11, 2023
99bd9ae
cargo clippy and fmt
neutrinoks Nov 13, 2023
4791a1b
Merge branch 'feature/1204080823207081_staking-collect-mechanism-2' i…
neutrinoks Nov 13, 2023
d7a3148
Merge branch 'feature/1204080823207081_upgrade_polkadot_v0.9.43' into…
neutrinoks Nov 13, 2023
a3237b4
manually solve dozens of conflicts
neutrinoks Nov 13, 2023
6697673
updated Cargo.lock
neutrinoks Nov 14, 2023
2a09711
Update zenlink
Nov 14, 2023
b47c2da
Merge branch 'feature/1204080823207081_upgrade_polkadot_v0.9.43' of g…
neutrinoks Nov 15, 2023
6dc1409
fix merge issue
neutrinoks Nov 15, 2023
b779045
Merge branch 'parachain_dev' into feature/1204080823207081_upgrade_po…
neutrinoks Nov 15, 2023
a2df793
Merge branch 'feature/1204080823207081_upgrade_polkadot_v0.9.43' into…
neutrinoks Nov 15, 2023
17d4c77
undo default docker setup
neutrinoks Nov 15, 2023
e00cce7
Merge branch 'parachain_dev' into feature/1204080823207081_staking-co…
neutrinoks Nov 15, 2023
f75fde9
last merge conflict stuff removed
neutrinoks Nov 15, 2023
05636af
pallet-aura needs to enable std in feature std
neutrinoks Nov 22, 2023
606f425
auto-increment in claim_rewards, true transfer of rewards
neutrinoks Nov 22, 2023
70e00d0
cargo clippy and fmt
neutrinoks Nov 22, 2023
e46c514
removed all remaining increment_*** things
neutrinoks Nov 22, 2023
68b8ec8
Merge branch 'dev' into feature/1204080823207081_staking-collect-mech…
neutrinoks Dec 14, 2023
54ed4f7
finished merge after cleaning up peaq-frame-ext
neutrinoks Dec 15, 2023
8046fc6
cargo fmt
neutrinoks Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pr-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

- name: "[Setup] Rust"
run: |
TLCHN=nightly-2022-11-03
TLCHN=nightly-2023-09-18
curl -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $TLCHN
rustup target add wasm32-unknown-unknown --toolchain $TLCHN
cargo install cargo-expand --locked --version 1.0.34
cargo install cargo-expand --locked --version 1.0.71

- name: Checkout Sources (actions/checkout)
uses: actions/checkout@v3
Expand Down
Loading