Feature/dapp staking pallet #441

hoonsubin · 2021-09-28T08:57:47Z

Checklist

all tests passes
tests and/or benchmarks are included
documentation is changed or added
(option)

Affected core subsystem(s)

Description of change

dApps Staking pallet for Shibuya test network.

frame/block-reward/src/lib.rs

frame/dapps-staking/src/lib.rs

runtime/local/src/lib.rs

frame/dapps-staking/src/pallet/mod.rs

Dinonard · 2021-09-30T09:54:07Z

frame/dapps-staking/src/pallet/mod.rs

+        /// Execute payout for stakers
+        fn payout_stakers(staker_map: &BTreeMap<T::AccountId, BalanceOf<T>>) {
+            for (s, b) in staker_map {
+                T::Currency::deposit_into_existing(&s, *b).ok();
+            }
+        }


@Maar-io
Perhaps this needs to be changed so that we transfer from dapps staking account to the staker?

Dapps rewards are deposited into dapps account so we need to payout those funds.

satellitex

Some weight is constants. It needs to be calculated from weight.rs with a count of the store and write.

* dapps-staking step1. (#405) * added unbond() withraw_unbonded() * dapp_staking_bond_test_wip * add EraFinder mock and test bonding not_ok Co-authored-by: Dinonard <dino.pacandi@gmail.com> * Expanded UT for bond() Added UT for bond_extra() and set_controller() Left some TODOs to discuss in review * add unbond() UT * withdraw_unbonded() UT * UT granularization, various improvements Co-authored-by: Mar.io <34627453+Maar-io@users.noreply.github.com>

* dapps-staking step1. (#405) * added unbond() withraw_unbonded() * dapp_staking_bond_test_wip * add EraFinder mock and test bonding not_ok Co-authored-by: Dinonard <dino.pacandi@gmail.com> * Expanded UT for bond() Added UT for bond_extra() and set_controller() Left some TODOs to discuss in review * add unbond() UT * withdraw_unbonded() UT * UT granularization, various improvements * resolving some merge issues * Feature/dapps register (#408) * register + test * added SmartContract struct * removed ContractFinder trait * Feature/dapp step1 (#407) * dapps-staking step1. (#405) * added unbond() withraw_unbonded() * dapp_staking_bond_test_wip * add EraFinder mock and test bonding not_ok Co-authored-by: Dinonard <dino.pacandi@gmail.com> * Expanded UT for bond() Added UT for bond_extra() and set_controller() Left some TODOs to discuss in review * add unbond() UT * withdraw_unbonded() UT * UT granularization, various improvements Co-authored-by: Mar.io <34627453+Maar-io@users.noreply.github.com> * register + test * added SmartContract struct * removed ContractFinder trait * add to runtime * resolvimg merge issues * fmt fix Co-authored-by: Dinonard <3002868+Dinonard@users.noreply.github.com> * review fixes. Added support for AlreadyUsedDeveloperAccount * fmt fix * moved helper register() on top * fmt test file * fmt fix after merge Co-authored-by: Dinonard <dino.pacandi@gmail.com> Co-authored-by: Dinonard <3002868+Dinonard@users.noreply.github.com>

* era handling and ForceEra * remove reward distribution from on_initialize

* added new storage maps * added comment for PalletEraRewards

* register() refactoring * updateds after review register() updated with initial: ContractLastClaimed ContractLastStaked * not needed empty insert for ContractLastClaimed and Staked

* Initial stake and unbond * Initial implementation of bond and stake * Finished bond_and_stake, start with UT * UT update & staked era bug fix * Added era reward struct * Pallet constants for staking, bug fixes, new UTs * Finalized unit test, ready for review * fix compilation error for runtime * documentation fixes * addressing review comments Weight calculation will be implemented in a follow-up PR.

* unbond,unstake&withdraw initial commit * additional UTs for unbond_and_withdraw * more UTs and bug fixes * added test utils, minor modifications

* initial claim() function * fmt fix and license info * added clearing of storage until claim era * UT with several staking for a contract * sceleton for payour_stakers() * more checks on claim() * fixes after running UT * review fixes * more review fixesž * optimize storage use during payout * minor comment fix * added UT for 2 contracts * minor merge fix * claim() review updates * use map instead of vec of vec, plus fmt * renaming and adding comments to claim algorithm * remove unnecessary cloning * implemented accumulator for era rewards

* Added DealWithFees handler for tx fees (#391) * Temporary disable custom signatures pallet (#401) * Temporary disable custom signatures pallet * Bump version * Fix custom signatures pallet (#402) * Added stale transaction traction * Added constant transaction fee * EVM contracts integration (#397) * Added EVM into runtime * Added EVM support into collator * Enabled Ethereum-compatible RPC * Added Frontier consensus middleware * Fix frontier consensus * Fix frontier invalid transaction bug * Added Shibuya testnet * Fix EVM gas fee charge (#411) * Fix pallet custom signatures issues (#412) * Fix pallet custom signatures issues * Update Cargo.lock * Development chain with EVM and Ink contracts (#423) * Development chain with EVM and Ink contracts * Fix code formatting * Added local chain properties * Enable EVM withdraws & customsig fixes (#419) * Enable EVM withdraws & customsig fixes * Enable customsig pallet for shiden * Fix EVM native tx conversion (#426) * Fix EVM native tx conversion * Increase Alice development endowment * Update Cargo.lock * Added staking EVM precompiles (#425) * re fork * remove recursive limit * add bond() bond_extra() set_controller() * formatting fix * Feature/dapp step1 (#407) * dapps-staking step1. (#405) * added unbond() withraw_unbonded() * dapp_staking_bond_test_wip * add EraFinder mock and test bonding not_ok Co-authored-by: Dinonard <dino.pacandi@gmail.com> * Expanded UT for bond() Added UT for bond_extra() and set_controller() Left some TODOs to discuss in review * add unbond() UT * withdraw_unbonded() UT * UT granularization, various improvements Co-authored-by: Mar.io <34627453+Maar-io@users.noreply.github.com> * Feature/dapp step2 (#409) * dapps-staking step1. (#405) * added unbond() withraw_unbonded() * dapp_staking_bond_test_wip * add EraFinder mock and test bonding not_ok Co-authored-by: Dinonard <dino.pacandi@gmail.com> * Expanded UT for bond() Added UT for bond_extra() and set_controller() Left some TODOs to discuss in review * add unbond() UT * withdraw_unbonded() UT * UT granularization, various improvements * resolving some merge issues * Feature/dapps register (#408) * register + test * added SmartContract struct * removed ContractFinder trait * Feature/dapp step1 (#407) * dapps-staking step1. (#405) * added unbond() withraw_unbonded() * dapp_staking_bond_test_wip * add EraFinder mock and test bonding not_ok Co-authored-by: Dinonard <dino.pacandi@gmail.com> * Expanded UT for bond() Added UT for bond_extra() and set_controller() Left some TODOs to discuss in review * add unbond() UT * withdraw_unbonded() UT * UT granularization, various improvements Co-authored-by: Mar.io <34627453+Maar-io@users.noreply.github.com> * register + test * added SmartContract struct * removed ContractFinder trait * add to runtime * resolvimg merge issues * fmt fix Co-authored-by: Dinonard <3002868+Dinonard@users.noreply.github.com> * review fixes. Added support for AlreadyUsedDeveloperAccount * fmt fix * moved helper register() on top * fmt test file * fmt fix after merge Co-authored-by: Dinonard <dino.pacandi@gmail.com> Co-authored-by: Dinonard <3002868+Dinonard@users.noreply.github.com> * dapps-staking Era handling (#410) * era handling and ForceEra * remove reward distribution from on_initialize * added new storage maps (#413) * added new storage maps * added comment for PalletEraRewards * Dapps-staking register() refactoring (#414) * register() refactoring * updateds after review register() updated with initial: ContractLastClaimed ContractLastStaked * not needed empty insert for ContractLastClaimed and Staked * Update Cargo.toml (#420) with license * Feature/bond and stake (#415) * Initial stake and unbond * Initial implementation of bond and stake * Finished bond_and_stake, start with UT * UT update & staked era bug fix * Added era reward struct * Pallet constants for staking, bug fixes, new UTs * Finalized unit test, ready for review * fix compilation error for runtime * documentation fixes * addressing review comments Weight calculation will be implemented in a follow-up PR. * License move to dapps (#421) * Feature/unbond unstake and withdraw (#424) * unbond,unstake&withdraw initial commit * additional UTs for unbond_and_withdraw * more UTs and bug fixes * added test utils, minor modifications * dapps staking claim (#422) * initial claim() function * fmt fix and license info * added clearing of storage until claim era * UT with several staking for a contract * sceleton for payour_stakers() * more checks on claim() * fixes after running UT * review fixes * more review fixesž * optimize storage use during payout * minor comment fix * added UT for 2 contracts * minor merge fix * claim() review updates * use map instead of vec of vec, plus fmt * renaming and adding comments to claim algorithm * remove unnecessary cloning * implemented accumulator for era rewards * moved pallet-dapps-staking to local runtime * megre conflict and fmt Co-authored-by: Aleksandr Krupenkin <mail@akru.me> Co-authored-by: satellitex <s.a.t.e.3.ths@gmail.com> Co-authored-by: Dinonard <3002868+Dinonard@users.noreply.github.com> Co-authored-by: Dinonard <dino.pacandi@gmail.com> Co-authored-by: Sota Watanabe <w.souta.s.life@gmail.com>

Co-authored-by: Dinonard <3002868+Dinonard@users.noreply.github.com>

* Initial dapps staking cleanup * Dapps staking cleanup 2nd part * Dapps staking cleanup part3 * Improved empty current era handling * Era reward bug fix * Revert some fixes * Addressed comments * Fixed issue with era staking and reward. 3 more UTs need to be changed * Claim UTs few fixes, more remains to be done

* Refactored claim method to handle eras beyond history depth. Added unclaimed reward accumulation * Rebase and some improvements * Comment update

* registration with preapproved list of contracts * format fix * renaming and using append

* Inject rewards into dapps staking pallet * local-runtime uses OnTimestamp * Use of OnUnbalanced trait * Aura and BLockReward tuple

* added counter for individual rewards * update claim UT * added counter for rewards paid out to contract * review rework * review rework2

* Added register deposit function * Fix code formatting * rebase updates Co-authored-by: Dinonard <dino.pacandi@gmail.com>

* SmartContract as trait * contract_id.is_contract() changes * changed SmartContract to trait * more rebase fixes * runtime updates for shibuya and local * changing Shibuya parameters, delete unused code * default HistoryDepth set to 30 * fixing reserved amount for registration * minor comment fix

* enable developer as the key for preapproval * use StorageMap instead of Vec for preapproved devs

* use secure hasher * Unregister implementation * Unregister unit tests * Addressed review comments * Use safe hasher * Rebase to latest

* added README.md * Some updates, added unregister documentation Co-authored-by: Dinonard <3002868+Dinonard@users.noreply.github.com>

Dinonard

LGTM...for the first version :D

Maar-io

let's go

Maar-io · 2021-10-04T14:25:40Z

@akru I think we addresses all comments. Please check and approve

hoonsubin requested review from akru and satellitex September 28, 2021 08:57

hoonsubin mentioned this pull request Sep 28, 2021

Dapps staking based branch #400

Closed

4 tasks

hoonsubin requested review from bobo-k2 and hskang9 September 28, 2021 09:00

Dinonard requested review from Dinonard and Maar-io September 28, 2021 09:02

akru suggested changes Sep 29, 2021

View reviewed changes

frame/block-reward/src/lib.rs Show resolved Hide resolved

frame/dapps-staking/src/lib.rs Outdated Show resolved Hide resolved

runtime/local/src/lib.rs Show resolved Hide resolved

akru suggested changes Sep 29, 2021

View reviewed changes

Dinonard reviewed Sep 30, 2021

View reviewed changes

satellitex reviewed Sep 30, 2021

View reviewed changes

Maar-io added this to In Progress in dApps staking Oct 1, 2021

satellitex and others added 18 commits October 4, 2021 14:15

re fork

80867ad

remove recursive limit

51385fc

add bond() bond_extra() set_controller()

de6d8f1

formatting fix

0cc1662

dapps-staking Era handling (#410)

2916cf4

* era handling and ForceEra * remove reward distribution from on_initialize

added new storage maps (#413)

4799012

* added new storage maps * added comment for PalletEraRewards

Dapps-staking register() refactoring (#414)

4a03058

* register() refactoring * updateds after review register() updated with initial: ContractLastClaimed ContractLastStaked * not needed empty insert for ContractLastClaimed and Staked

Update Cargo.toml (#420) with license

cabe0e7

License move to dapps (#421)

c6902f4

Feature/unbond unstake and withdraw (#424)

d595732

* unbond,unstake&withdraw initial commit * additional UTs for unbond_and_withdraw * more UTs and bug fixes * added test utils, minor modifications

test failing due to wrong name (#430)

330146c

wrong era to read EraRewardsAndStakes (#431)

a1be716

Co-authored-by: Dinonard <3002868+Dinonard@users.noreply.github.com>

Maar-io and others added 10 commits October 4, 2021 14:16

refactoring claim UTs (#438)

429cb91

Feature/dapps staking claim refactor (#439)

a06c4c1

* Refactored claim method to handle eras beyond history depth. Added unclaimed reward accumulation * Rebase and some improvements * Comment update

registration with pre-approved list of contracts (#442)

9c80e4c

* registration with preapproved list of contracts * format fix * renaming and using append

Inject rewards into dapps staking pallet (#448)

8824f71

* Inject rewards into dapps staking pallet * local-runtime uses OnTimestamp * Use of OnUnbalanced trait * Aura and BLockReward tuple

added counter for individual rewards (#450)

fe6eaff

* added counter for individual rewards * update claim UT * added counter for rewards paid out to contract * review rework * review rework2

Added register deposit function (#451)

10bea8c

* Added register deposit function * Fix code formatting * rebase updates Co-authored-by: Dinonard <dino.pacandi@gmail.com>

enable developer as the key for preapproval (#455)

c315f75

* enable developer as the key for preapproval * use StorageMap instead of Vec for preapproved devs

adding Vesting pallet (#459)

70f359e

Feature/dapps staking unregister (#458)

4effdb7

* use secure hasher * Unregister implementation * Unregister unit tests * Addressed review comments * Use safe hasher * Rebase to latest

Dinonard force-pushed the feature/dapp-staking-pallet branch from 5e19e09 to 4effdb7 Compare October 4, 2021 12:16

Adding README.md for pallet-dapps-staking (#460)

701819f

* added README.md * Some updates, added unregister documentation Co-authored-by: Dinonard <3002868+Dinonard@users.noreply.github.com>

Dinonard approved these changes Oct 4, 2021

View reviewed changes

Dinonard requested a review from akru October 4, 2021 14:24

Maar-io approved these changes Oct 4, 2021

View reviewed changes

hoonsubin merged commit 35169c1 into development/shiden Oct 4, 2021

dApps staking automation moved this from In Progress to Done Oct 4, 2021

hoonsubin deleted the feature/dapp-staking-pallet branch October 4, 2021 15:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/dapp staking pallet #441

Feature/dapp staking pallet #441

hoonsubin commented Sep 28, 2021 •

edited

Dinonard Sep 30, 2021

satellitex left a comment

Dinonard left a comment

Maar-io left a comment

Maar-io commented Oct 4, 2021

Feature/dapp staking pallet #441

Feature/dapp staking pallet #441

Conversation

hoonsubin commented Sep 28, 2021 • edited

Checklist

Affected core subsystem(s)

Description of change

Dinonard Sep 30, 2021

Choose a reason for hiding this comment

satellitex left a comment

Choose a reason for hiding this comment

Dinonard left a comment

Choose a reason for hiding this comment

Maar-io left a comment

Choose a reason for hiding this comment

Maar-io commented Oct 4, 2021

hoonsubin commented Sep 28, 2021 •

edited