difftreelog
Merge branch 'develop' into feature/multi-assets-redone
in: master
12 files changed
.github/workflows/ci-master.ymldiffbeforeafterboth--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -18,16 +18,13 @@
uses: ./.github/workflows/node-only-update_v2.yml
forkless:
- if: ${{ contains( github.event.pull_request.labels.*.name, 'forkless') }}
uses: ./.github/workflows/forkless.yml
canary:
- if: ${{ contains( github.event.pull_request.labels.*.name, 'canary') }}
uses: ./.github/workflows/canary.yml
secrets: inherit # pass all secrets
xcm:
- if: ${{ contains( github.event.pull_request.labels.*.name, 'xcm') }}
uses: ./.github/workflows/xcm.yml
secrets: inherit # pass all secrets
.github/workflows/market-test.ymldiffbeforeafterboth--- a/.github/workflows/market-test.yml
+++ /dev/null
@@ -1,227 +0,0 @@
-name: market api tests
-
-# Controls when the action will run.
-on:
- # Triggers the workflow on push or pull request events but only for the master branch
- pull_request:
- branches:
- - master
- types:
- - opened
- - reopened
- - synchronize #commit(s) pushed to the pull request
- - ready_for_review
-
- # Allows you to run this workflow manually from the Actions tab
- workflow_dispatch:
-
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: true
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-
- market_test:
- # The type of runner that the job will run on
- runs-on: [self-hosted-ci,large]
- timeout-minutes: 1380
-
- strategy:
- matrix:
- include:
- - network: "opal"
- features: "opal-runtime"
- - network: "quartz"
- features: "quartz-runtime"
- - network: "unique"
- features: "unique-runtime"
-
- name: draft job
-
- continue-on-error: true #Do not stop testing of matrix runs failed. As it decided during PR review - it required 50/50& Let's check it with false.
-
-
- steps:
-# - name: Skip if pull request is in Draft
- # `if: github.event.pull_request.draft == true` should be kept here, at
- # the step level, rather than at the job level. The latter is not
- # recommended because when the PR is moved from "Draft" to "Ready to
- # review" the workflow will immediately be passing (since it was skipped),
- # even though it hasn't actually ran, since it takes a few seconds for
- # the workflow to start. This is also disclosed in:
- # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
- # That scenario would open an opportunity for the check to be bypassed:
- # 1. Get your PR approved
- # 2. Move it to Draft
- # 3. Push whatever commits you want
- # 4. Move it to "Ready for review"; now the workflow is passing (it was
- # skipped) and "Check reviews" is also passing (it won't be updated
- # until the workflow is finished)
-# if: github.event.pull_request.draft == true
-# run: exit 1
-
- - name: Clean Workspace
- uses: AutoModality/action-clean@v1.1.0
-
- # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- - name: Checkout master repo
- uses: actions/checkout@master
- with:
- ref: ${{ github.head_ref }} #Checking out head commit
-
- - name: Checkout Market e2e tests
- uses: actions/checkout@v3
- with:
- repository: 'UniqueNetwork/market-e2e-tests'
- ssh-key: '${{ secrets.GH_PAT }}'
- path: 'qa-tests'
- ref: 'QA-65_maxandreev'
-
- - name: Read .env file
- uses: xom9ikk/dotenv@v1.0.2
-
- - name: Copy qa-tests/.env.example to qa-tests/.env
- working-directory: qa-tests
- run: cp .env.docker .env
-
- - name: Show content of qa-test/.env
- working-directory: qa-tests
- run: cat .env
-
- - name: Read qa -test .env file
- uses: xom9ikk/dotenv@v1.0.2
- with:
- path: qa-tests/
-
- - name: Generate ENV related extend file for docker-compose
- uses: cuchi/jinja2-action@v1.2.0
- with:
- template: qa-tests/.docker/docker-compose.tmp-market.j2
- output_file: qa-tests/.docker/docker-compose.${{ matrix.network }}.yml
- variables: |
- REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
- RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
- POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
- FEATURE=${{ matrix.features }}
- BRANCH=${{ github.head_ref }}
-
-
- - name: Show build configuration
- working-directory: qa-tests
- run: cat .docker/docker-compose.${{ matrix.network }}.yml
-
- - name: Start node-parachain
- working-directory: qa-tests
- run: docker-compose -f ".docker/docker-compose.market.yml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --remove-orphans --force-recreate node-parachain
-
- - name: Start nonce-app
- working-directory: qa-tests
- run: docker-compose -f ".docker/docker-compose.market.yml" up -d --build --remove-orphans --force-recreate nonce-app
-
- - uses: actions/setup-node@v3
- with:
- node-version: 16
-
- - name: Setup TypeScript
- working-directory: qa-tests
- run: |
- npm install
- npm install -g ts-node
-
- - name: Copy qa-tests/.env.example to qa-tests/.env
- working-directory: qa-tests
- run: |
- rm -rf .env
- cp .env.example .env
-
-
- - name: Show content of qa-test/.env
- working-directory: qa-tests
- run: cat .env
-
-
- - name: Read qa -test .env file
- uses: xom9ikk/dotenv@v1.0.2
- with:
- path: qa-tests/
-
- - name: Generate accounts
- working-directory: qa-tests
- run: ts-node ./src/scripts/create-market-accounts.ts
-
- - name: Deploy contracts
- run: |
- cd qa-tests
- ts-node ./src/scripts/deploy-contract.ts
-
- - name: Import test data
- working-directory: qa-tests
- run: ts-node ./src/scripts/create-test-collections.ts
-
- - name: Show content of qa-test .env
- working-directory: qa-tests
- run: cat .env
-
- - name: Copy qa-tests/.env.example to qa-tests/.env
- working-directory: qa-tests
- run: |
- rm -rf .env.docker
- cp .env .env.docker
- sed -i '/UNIQUE_WS_ENDPOINT/c UNIQUE_WS_ENDPOINT=ws://node-parachain:9944' .env.docker
-
- - name: Read qa -test .env file
- uses: xom9ikk/dotenv@v1.0.2
- with:
- path: qa-tests/
-
- - name: local-market:start
- run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" up -d --build
-
- - name: Wait for market readyness
- working-directory: qa-tests
- run: src/scripts/wait-market-ready.sh
- shell: bash
-
- - name: Install dependecies
- working-directory: qa-tests
- run: |
- npm ci
- npm install -D @playwright/test
- npx playwright install-deps
- npx playwright install
-
- - name:
- working-directory: qa-tests
- run: |
- npx playwright test --workers=8 --quiet .*.api.test.ts --reporter=github --config playwright.config.ts
-
- - name: Show env variables
- if: success() || failure()
- run: printenv
-
- - name: look up for report
- if: success() || failure()
- run: |
- ls -la
- ls -la qa-tests/
-
-
- - name: Stop running containers
- if: always() # run this step always
- run: docker-compose -f "qa-tests/.docker/docker-compose.market.yml" -f "qa-tests/.docker/docker-compose.${{ matrix.network }}.yml" down --volumes
-
- - name: Remove builder cache
- if: always() # run this step always
- run: |
- docker builder prune -f
- docker system prune -f
-
- - name: Clean Workspace
- if: always()
- uses: AutoModality/action-clean@v1.1.0
-
-
-
-
.github/workflows/market-test_v2.ymldiffbeforeafterboth--- a/.github/workflows/market-test_v2.yml
+++ b/.github/workflows/market-test_v2.yml
@@ -45,7 +45,7 @@
repository: 'UniqueNetwork/market-e2e-tests'
ssh-key: ${{ secrets.GH_PAT }}
path: 'qa-tests'
- ref: 'ci_test_v2'
+ ref: 'master'
- name: Read .env file
uses: xom9ikk/dotenv@v1.0.2
.github/workflows/node-only-update_v2.ymldiffbeforeafterboth--- a/.github/workflows/node-only-update_v2.yml
+++ b/.github/workflows/node-only-update_v2.yml
@@ -10,7 +10,7 @@
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
- execution-marix:
+ nodes-execution-matrix:
name: execution matrix
@@ -42,8 +42,8 @@
- forkless-update-nodata:
- needs: execution-marix
+ nodes-only-update:
+ needs: nodes-execution-matrix
# The type of runner that the job will run on
runs-on: [self-hosted-ci,large]
@@ -57,7 +57,7 @@
strategy:
matrix:
- include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
+ include: ${{fromJson(needs.nodes-execution-matrix.outputs.matrix)}}
steps:
@@ -156,12 +156,18 @@
exit 0
shell: bash
+ - name: Checkout at '${{ matrix.mainnet_branch }}' branch
+ uses: actions/checkout@master
+ with:
+ ref: ${{ matrix.mainnet_branch }} #Checking out head commit
+ path: ${{ matrix.mainnet_branch }}
+
+
- name: Run tests before Node Parachain upgrade
- working-directory: tests
+ working-directory: ${{ matrix.mainnet_branch }}/tests
run: |
yarn install
yarn add mochawesome
- node scripts/readyness.js
echo "Ready to start tests"
yarn polkadot-types
NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
@@ -174,7 +180,7 @@
if: success() || failure() # run this step even if previous step failed
with:
name: Tests before node upgrade ${{ matrix.network }} # Name of the check run which will be created
- path: tests/mochawesome-report/test-*.json # Path to test results
+ path: ${{ matrix.mainnet_branch }}/tests/mochawesome-report/test-*.json # Path to test results
reporter: mochawesome-json
fail-on-error: 'false'
@@ -263,8 +269,9 @@
- name: Remove builder cache
if: always() # run this step always
run: |
- docker builder prune -f
+ docker builder prune -f -a
docker system prune -f
+ docker image prune -f -a
- name: Clean Workspace
if: always()
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6600,7 +6600,7 @@
[[package]]
name = "pallet-unique"
-version = "0.1.4"
+version = "0.2.0"
dependencies = [
"ethereum",
"evm-coder",
pallets/app-promotion/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # App Promotion pallet18//!19//! The pallet implements the mechanics of staking and sponsoring collections/contracts.20//!21//! - [`Config`]22//! - [`Pallet`]23//! - [`Error`]24//! - [`Event`]25//!26//! ## Overview27//! The App Promotion pallet allows fund holders to stake at a certain daily rate of return.28//! The mechanics implemented in the pallet allow it to act as a sponsor for collections / contracts,29//! the list of which is set by the pallet administrator.30//! 31//!32//! ## Interface33//! The pallet provides interfaces for funds, collection/contract operations (see [types] module).3435//!36//! ### Dispatchable Functions37//! - [`set_admin_address`][`Pallet::set_admin_address`] - sets an address as the the admin.38//! - [`stake`][`Pallet::stake`] - stakes the amount of native tokens.39//! - [`unstake`][`Pallet::unstake`] - unstakes all stakes.40//! - [`sponsor_collection`][`Pallet::sponsor_collection`] - sets the pallet to be the sponsor for the collection.41//! - [`stop_sponsoring_collection`][`Pallet::stop_sponsoring_collection`] - removes the pallet as the sponsor for the collection.42//! - [`sponsor_contract`][`Pallet::sponsor_contract`] - sets the pallet to be the sponsor for the contract.43//! - [`stop_sponsoring_contract`][`Pallet::stop_sponsoring_contract`] - removes the pallet as the sponsor for the contract.44//! - [`payout_stakers`][`Pallet::payout_stakers`] - recalculates interest for the specified number of stakers.45//!4647// #![recursion_limit = "1024"]48#![cfg_attr(not(feature = "std"), no_std)]4950#[cfg(feature = "runtime-benchmarks")]51mod benchmarking;5253pub mod types;54pub mod weights;5556use sp_std::{57 vec::{Vec},58 vec,59 iter::Sum,60 borrow::ToOwned,61 cell::RefCell,62};63use sp_core::H160;64use codec::EncodeLike;65use pallet_balances::BalanceLock;66pub use types::*;6768use up_data_structs::CollectionId;6970use frame_support::{71 dispatch::{DispatchResult},72 traits::{73 Currency, Get, LockableCurrency, WithdrawReasons, tokens::Balance, ExistenceRequirement,74 },75 ensure,76};7778use weights::WeightInfo;7980pub use pallet::*;81use pallet_evm::account::CrossAccountId;82use sp_runtime::{83 Perbill,84 traits::{BlockNumberProvider, CheckedAdd, CheckedSub, AccountIdConversion, Zero},85 ArithmeticError,86};8788pub const LOCK_IDENTIFIER: [u8; 8] = *b"appstake";8990const PENDING_LIMIT_PER_BLOCK: u32 = 3;9192type BalanceOf<T> =93 <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;9495#[frame_support::pallet]96pub mod pallet {97 use super::*;98 use frame_support::{99 Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key, PalletId,100 traits::ReservableCurrency,101 };102 use frame_system::pallet_prelude::*;103104 #[pallet::config]105 pub trait Config: frame_system::Config + pallet_evm::account::Config {106 /// Type to interact with the native token107 type Currency: ExtendedLockableCurrency<Self::AccountId>108 + ReservableCurrency<Self::AccountId>;109110 /// Type for interacting with collections111 type CollectionHandler: CollectionHandler<112 AccountId = Self::AccountId,113 CollectionId = CollectionId,114 >;115116 /// Type for interacting with conrtacts117 type ContractHandler: ContractHandler<AccountId = Self::CrossAccountId, ContractId = H160>;118119 /// `AccountId` for treasury120 type TreasuryAccountId: Get<Self::AccountId>;121122 /// The app's pallet id, used for deriving its sovereign account address.123 #[pallet::constant]124 type PalletId: Get<PalletId>;125126 /// In relay blocks.127 #[pallet::constant]128 type RecalculationInterval: Get<Self::BlockNumber>;129130 /// In parachain blocks.131 #[pallet::constant]132 type PendingInterval: Get<Self::BlockNumber>;133134 /// Rate of return for interval in blocks defined in `RecalculationInterval`.135 #[pallet::constant]136 type IntervalIncome: Get<Perbill>;137138 /// Decimals for the `Currency`.139 #[pallet::constant]140 type Nominal: Get<BalanceOf<Self>>;141142 /// Weight information for extrinsics in this pallet.143 type WeightInfo: WeightInfo;144145 // The relay block number provider146 type RelayBlockNumberProvider: BlockNumberProvider<BlockNumber = Self::BlockNumber>;147148 /// Events compatible with [`frame_system::Config::Event`].149 type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;150 }151152 #[pallet::pallet]153 #[pallet::generate_store(pub(super) trait Store)]154 pub struct Pallet<T>(_);155156 #[pallet::event]157 #[pallet::generate_deposit(fn deposit_event)]158 pub enum Event<T: Config> {159 /// Staking recalculation was performed160 ///161 /// # Arguments162 /// * AccountId: account of the staker.163 /// * Balance : recalculation base164 /// * Balance : total income165 StakingRecalculation(166 /// An recalculated staker167 T::AccountId,168 /// Base on which interest is calculated169 BalanceOf<T>,170 /// Amount of accrued interest171 BalanceOf<T>,172 ),173174 /// Staking was performed175 ///176 /// # Arguments177 /// * AccountId: account of the staker178 /// * Balance : staking amount179 Stake(T::AccountId, BalanceOf<T>),180181 /// Unstaking was performed182 ///183 /// # Arguments184 /// * AccountId: account of the staker185 /// * Balance : unstaking amount186 Unstake(T::AccountId, BalanceOf<T>),187188 /// The admin was set189 ///190 /// # Arguments191 /// * AccountId: account address of the admin192 SetAdmin(T::AccountId),193 }194195 #[pallet::error]196 pub enum Error<T> {197 /// Error due to action requiring admin to be set.198 AdminNotSet,199 /// No permission to perform an action.200 NoPermission,201 /// Insufficient funds to perform an action.202 NotSufficientFunds,203 /// Occurs when a pending unstake cannot be added in this block. PENDING_LIMIT_PER_BLOCK` limits exceeded.204 PendingForBlockOverflow,205 /// The error is due to the fact that the collection/contract must already be sponsored in order to perform the action.206 SponsorNotSet,207 /// Errors caused by incorrect actions with a locked balance.208 IncorrectLockedBalanceOperation,209 }210211 /// Stores the total staked amount.212 #[pallet::storage]213 pub type TotalStaked<T: Config> = StorageValue<Value = BalanceOf<T>, QueryKind = ValueQuery>;214215 /// Stores the `admin` account. Some extrinsics can only be executed if they were signed by `admin`.216 #[pallet::storage]217 pub type Admin<T: Config> = StorageValue<Value = T::AccountId, QueryKind = OptionQuery>;218219 /// Stores the amount of tokens staked by account in the blocknumber.220 ///221 /// * **Key1** - Staker account.222 /// * **Key2** - Relay block number when the stake was made.223 /// * **(Balance, BlockNumber)** - Balance of the stake.224 /// The number of the relay block in which we must perform the interest recalculation225 #[pallet::storage]226 pub type Staked<T: Config> = StorageNMap<227 Key = (228 Key<Blake2_128Concat, T::AccountId>,229 Key<Twox64Concat, T::BlockNumber>,230 ),231 Value = (BalanceOf<T>, T::BlockNumber),232 QueryKind = ValueQuery,233 >;234235 /// Stores amount of stakes for an `Account`.236 ///237 /// * **Key** - Staker account.238 /// * **Value** - Amount of stakes.239 #[pallet::storage]240 pub type StakesPerAccount<T: Config> =241 StorageMap<_, Blake2_128Concat, T::AccountId, u8, ValueQuery>;242243 /// Stores amount of stakes for an `Account`.244 ///245 /// * **Key** - Staker account.246 /// * **Value** - Amount of stakes.247 #[pallet::storage]248 pub type PendingUnstake<T: Config> = StorageMap<249 _,250 Twox64Concat,251 T::BlockNumber,252 BoundedVec<(T::AccountId, BalanceOf<T>), ConstU32<PENDING_LIMIT_PER_BLOCK>>,253 ValueQuery,254 >;255256 /// Stores a key for record for which the next revenue recalculation would be performed.257 /// If `None`, then recalculation has not yet been performed or calculations have been completed for all stakers.258 #[pallet::storage]259 #[pallet::getter(fn get_next_calculated_record)]260 pub type NextCalculatedRecord<T: Config> =261 StorageValue<Value = (T::AccountId, T::BlockNumber), QueryKind = OptionQuery>;262263 #[pallet::hooks]264 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {265 /// Block overflow is impossible due to the fact that the unstake algorithm in on_initialize266 /// implies the execution of a strictly limited number of relatively lightweight operations.267 /// A separate benchmark has been implemented to scale the weight depending on the number of pendings.268 fn on_initialize(current_block_number: T::BlockNumber) -> Weight269 where270 <T as frame_system::Config>::BlockNumber: From<u32>,271 {272 let block_pending = PendingUnstake::<T>::take(current_block_number);273 let counter = block_pending.len() as u32;274275 if !block_pending.is_empty() {276 block_pending.into_iter().for_each(|(staker, amount)| {277 <T::Currency as ReservableCurrency<T::AccountId>>::unreserve(&staker, amount);278 });279 }280281 T::WeightInfo::on_initialize(counter)282 }283 }284285 #[pallet::call]286 impl<T: Config> Pallet<T>287 where288 T::BlockNumber: From<u32> + Into<u32>,289 <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum + From<u128>,290 {291 /// Sets an address as the the admin.292 ///293 /// # Permissions294 ///295 /// * Sudo296 ///297 /// # Arguments298 ///299 /// * `admin`: account of the new admin.300 #[pallet::weight(T::WeightInfo::set_admin_address())]301 pub fn set_admin_address(origin: OriginFor<T>, admin: T::CrossAccountId) -> DispatchResult {302 ensure_root(origin)?;303304 <Admin<T>>::set(Some(admin.as_sub().to_owned()));305306 Self::deposit_event(Event::SetAdmin(admin.as_sub().to_owned()));307308 Ok(())309 }310311 /// Stakes the amount of native tokens.312 /// Sets `amount` to the locked state.313 /// The maximum number of stakes for a staker is 10.314 ///315 /// # Arguments316 ///317 /// * `amount`: in native tokens.318 #[pallet::weight(T::WeightInfo::stake())]319 pub fn stake(staker: OriginFor<T>, amount: BalanceOf<T>) -> DispatchResult {320 let staker_id = ensure_signed(staker)?;321322 ensure!(323 StakesPerAccount::<T>::get(&staker_id) < 10,324 Error::<T>::NoPermission325 );326327 ensure!(328 amount >= <BalanceOf<T>>::from(100u128) * T::Nominal::get(),329 ArithmeticError::Underflow330 );331332 let balance =333 <<T as Config>::Currency as Currency<T::AccountId>>::free_balance(&staker_id);334335 // checks that we can lock `amount` on the `staker` account.336 <<T as Config>::Currency as Currency<T::AccountId>>::ensure_can_withdraw(337 &staker_id,338 amount,339 WithdrawReasons::all(),340 balance341 .checked_sub(&amount)342 .ok_or(ArithmeticError::Underflow)?,343 )?;344345 Self::add_lock_balance(&staker_id, amount)?;346347 let block_number = T::RelayBlockNumberProvider::current_block_number();348349 // Calculation of the number of recalculation periods,350 // after how much the first interest calculation should be performed for the stake351 let recalculate_after_interval: T::BlockNumber =352 if block_number % T::RecalculationInterval::get() == 0u32.into() {353 1u32.into()354 } else {355 2u32.into()356 };357358 // Сalculation of the number of the relay block359 // in which it is necessary to accrue remuneration for the stake.360 let recalc_block = (block_number / T::RecalculationInterval::get()361 + recalculate_after_interval)362 * T::RecalculationInterval::get();363364 <Staked<T>>::insert((&staker_id, block_number), {365 let mut balance_and_recalc_block = <Staked<T>>::get((&staker_id, block_number));366 balance_and_recalc_block.0 = balance_and_recalc_block367 .0368 .checked_add(&amount)369 .ok_or(ArithmeticError::Overflow)?;370 balance_and_recalc_block.1 = recalc_block;371 balance_and_recalc_block372 });373374 <TotalStaked<T>>::set(375 <TotalStaked<T>>::get()376 .checked_add(&amount)377 .ok_or(ArithmeticError::Overflow)?,378 );379380 StakesPerAccount::<T>::mutate(&staker_id, |stakes| *stakes += 1);381382 Self::deposit_event(Event::Stake(staker_id, amount));383384 Ok(())385 }386387 /// Unstakes all stakes.388 /// Moves the sum of all stakes to the `reserved` state.389 /// After the end of `PendingInterval` this sum becomes completely390 /// free for further use.391 #[pallet::weight(T::WeightInfo::unstake())]392 pub fn unstake(staker: OriginFor<T>) -> DispatchResultWithPostInfo {393 let staker_id = ensure_signed(staker)?;394395 // calculate block number where the sum would be free396 let block = <frame_system::Pallet<T>>::block_number() + T::PendingInterval::get();397398 let mut pendings = <PendingUnstake<T>>::get(block);399400 // checks that we can do unreserve stakes in the block401 ensure!(!pendings.is_full(), Error::<T>::PendingForBlockOverflow);402403 let mut total_stakes = 0u64;404405 let total_staked: BalanceOf<T> = Staked::<T>::drain_prefix((&staker_id,))406 .map(|(_, (amount, _))| {407 total_stakes += 1;408 amount409 })410 .sum();411412 if total_staked.is_zero() {413 return Ok(None.into()); // TO-DO414 }415416 pendings417 .try_push((staker_id.clone(), total_staked))418 .map_err(|_| Error::<T>::PendingForBlockOverflow)?;419420 <PendingUnstake<T>>::insert(block, pendings);421422 Self::unlock_balance(&staker_id, total_staked)?;423424 <T::Currency as ReservableCurrency<T::AccountId>>::reserve(&staker_id, total_staked)?;425426 TotalStaked::<T>::set(427 TotalStaked::<T>::get()428 .checked_sub(&total_staked)429 .ok_or(ArithmeticError::Underflow)?,430 );431432 StakesPerAccount::<T>::remove(&staker_id);433434 Self::deposit_event(Event::Unstake(staker_id, total_staked));435436 Ok(None.into())437 }438439 /// Sets the pallet to be the sponsor for the collection.440 ///441 /// # Permissions442 ///443 /// * Pallet admin444 ///445 /// # Arguments446 ///447 /// * `collection_id`: ID of the collection that will be sponsored by `pallet_id`448 #[pallet::weight(T::WeightInfo::sponsor_collection())]449 pub fn sponsor_collection(450 admin: OriginFor<T>,451 collection_id: CollectionId,452 ) -> DispatchResult {453 let admin_id = ensure_signed(admin)?;454 ensure!(455 admin_id == Admin::<T>::get().ok_or(Error::<T>::AdminNotSet)?,456 Error::<T>::NoPermission457 );458459 T::CollectionHandler::set_sponsor(Self::account_id(), collection_id)460 }461462 /// Removes the pallet as the sponsor for the collection.463 /// Returns [`NoPermission`][`Error::NoPermission`]464 /// if the pallet wasn't the sponsor.465 ///466 /// # Permissions467 ///468 /// * Pallet admin469 ///470 /// # Arguments471 ///472 /// * `collection_id`: ID of the collection that is sponsored by `pallet_id`473 #[pallet::weight(T::WeightInfo::stop_sponsoring_collection())]474 pub fn stop_sponsoring_collection(475 admin: OriginFor<T>,476 collection_id: CollectionId,477 ) -> DispatchResult {478 let admin_id = ensure_signed(admin)?;479480 ensure!(481 admin_id == Admin::<T>::get().ok_or(Error::<T>::AdminNotSet)?,482 Error::<T>::NoPermission483 );484485 ensure!(486 T::CollectionHandler::sponsor(collection_id)?.ok_or(<Error<T>>::SponsorNotSet)?487 == Self::account_id(),488 <Error<T>>::NoPermission489 );490 T::CollectionHandler::remove_collection_sponsor(collection_id)491 }492493 /// Sets the pallet to be the sponsor for the contract.494 ///495 /// # Permissions496 ///497 /// * Pallet admin498 ///499 /// # Arguments500 ///501 /// * `contract_id`: the contract address that will be sponsored by `pallet_id`502 #[pallet::weight(T::WeightInfo::sponsor_contract())]503 pub fn sponsor_contract(admin: OriginFor<T>, contract_id: H160) -> DispatchResult {504 let admin_id = ensure_signed(admin)?;505506 ensure!(507 admin_id == Admin::<T>::get().ok_or(Error::<T>::AdminNotSet)?,508 Error::<T>::NoPermission509 );510511 T::ContractHandler::set_sponsor(512 T::CrossAccountId::from_sub(Self::account_id()),513 contract_id,514 )515 }516517 /// Removes the pallet as the sponsor for the contract.518 /// Returns [`NoPermission`][`Error::NoPermission`]519 /// if the pallet wasn't the sponsor.520 ///521 /// # Permissions522 ///523 /// * Pallet admin524 ///525 /// # Arguments526 ///527 /// * `contract_id`: the contract address that is sponsored by `pallet_id`528 #[pallet::weight(T::WeightInfo::stop_sponsoring_contract())]529 pub fn stop_sponsoring_contract(admin: OriginFor<T>, contract_id: H160) -> DispatchResult {530 let admin_id = ensure_signed(admin)?;531532 ensure!(533 admin_id == Admin::<T>::get().ok_or(Error::<T>::AdminNotSet)?,534 Error::<T>::NoPermission535 );536537 ensure!(538 T::ContractHandler::sponsor(contract_id)?539 .ok_or(<Error<T>>::SponsorNotSet)?540 .as_sub() == &Self::account_id(),541 <Error<T>>::NoPermission542 );543 T::ContractHandler::remove_contract_sponsor(contract_id)544 }545546 /// Recalculates interest for the specified number of stakers.547 /// If all stakers are not recalculated, the next call of the extrinsic548 /// will continue the recalculation, from those stakers for whom this549 /// was not perform in last call.550 ///551 /// # Permissions552 ///553 /// * Pallet admin554 ///555 /// # Arguments556 ///557 /// * `stakers_number`: the number of stakers for which recalculation will be performed558 #[pallet::weight(T::WeightInfo::payout_stakers(stakers_number.unwrap_or(20) as u32))]559 pub fn payout_stakers(admin: OriginFor<T>, stakers_number: Option<u8>) -> DispatchResult {560 let admin_id = ensure_signed(admin)?;561562 ensure!(563 admin_id == Admin::<T>::get().ok_or(Error::<T>::AdminNotSet)?,564 Error::<T>::NoPermission565 );566567 // calculate the number of the current recalculation block,568 // this is necessary in order to understand which stakers we should calculate interest569 let current_recalc_block =570 Self::get_current_recalc_block(T::RelayBlockNumberProvider::current_block_number());571572 // calculate the number of the next recalculation block,573 // this value is set for the stakers to whom the recalculation will be performed574 let next_recalc_block = current_recalc_block + T::RecalculationInterval::get();575576 let mut storage_iterator = Self::get_next_calculated_key()577 .map_or(Staked::<T>::iter(), |key| Staked::<T>::iter_from(key));578579 NextCalculatedRecord::<T>::set(None);580581 {582 let mut stakers_number = stakers_number.unwrap_or(20);583 let last_id = RefCell::new(None);584 let income_acc = RefCell::new(BalanceOf::<T>::default());585 let amount_acc = RefCell::new(BalanceOf::<T>::default());586587 // this closure is used to perform some of the actions if we break the loop because we reached the number of stakers for recalculation,588 // but there were unrecalculated records in the storage.589 let flush_stake = || -> DispatchResult {590 if let Some(last_id) = &*last_id.borrow() {591 if !income_acc.borrow().is_zero() {592 <T::Currency as Currency<T::AccountId>>::transfer(593 &T::TreasuryAccountId::get(),594 last_id,595 *income_acc.borrow(),596 ExistenceRequirement::KeepAlive,597 )598 .and_then(|_| {599 Self::add_lock_balance(last_id, *income_acc.borrow())?;600 <TotalStaked<T>>::try_mutate(|staked| {601 staked602 .checked_add(&*income_acc.borrow())603 .ok_or(ArithmeticError::Overflow.into())604 })605 })?;606607 Self::deposit_event(Event::StakingRecalculation(608 last_id.clone(),609 *amount_acc.borrow(),610 *income_acc.borrow(),611 ));612 }613614 *income_acc.borrow_mut() = BalanceOf::<T>::default();615 *amount_acc.borrow_mut() = BalanceOf::<T>::default();616 }617 Ok(())618 };619620 while let Some((621 (current_id, staked_block),622 (amount, next_recalc_block_for_stake),623 )) = storage_iterator.next()624 {625 if stakers_number == 0 {626 NextCalculatedRecord::<T>::set(Some((current_id, staked_block)));627 break;628 }629 if last_id.borrow().as_ref() != Some(¤t_id) {630 flush_stake()?;631 *last_id.borrow_mut() = Some(current_id.clone());632 stakers_number -= 1;633 };634 if current_recalc_block >= next_recalc_block_for_stake {635 *amount_acc.borrow_mut() += amount;636 Self::recalculate_and_insert_stake(637 ¤t_id,638 staked_block,639 next_recalc_block,640 amount,641 ((current_recalc_block - next_recalc_block_for_stake)642 / T::RecalculationInterval::get())643 .into() + 1,644 &mut *income_acc.borrow_mut(),645 );646 }647 }648 flush_stake()?;649 }650651 Ok(())652 }653 }654}655656impl<T: Config> Pallet<T> {657 /// The account address of the app promotion pot.658 ///659 /// This actually does computation. If you need to keep using it, then make sure you cache the660 /// value and only call this once.661 pub fn account_id() -> T::AccountId {662 T::PalletId::get().into_account_truncating()663 }664665 /// Unlocks the balance that was locked by the pallet.666 ///667 /// - `staker`: staker account.668 /// - `amount`: amount of unlocked funds.669 fn unlock_balance(staker: &T::AccountId, amount: BalanceOf<T>) -> DispatchResult {670 let locked_balance = Self::get_locked_balance(staker)671 .map(|l| l.amount)672 .ok_or(<Error<T>>::IncorrectLockedBalanceOperation)?;673674 // It is understood that we cannot unlock more funds than were locked by staking.675 // Therefore, if implemented correctly, this error should not occur.676 Self::set_lock_unchecked(677 staker,678 locked_balance679 .checked_sub(&amount)680 .ok_or(ArithmeticError::Underflow)?,681 );682 Ok(())683 }684685 /// Adds the balance to locked by the pallet.686 ///687 /// - `staker`: staker account.688 /// - `amount`: amount of added locked funds.689 fn add_lock_balance(staker: &T::AccountId, amount: BalanceOf<T>) -> DispatchResult {690 Self::get_locked_balance(staker)691 .map_or(<BalanceOf<T>>::default(), |l| l.amount)692 .checked_add(&amount)693 .map(|new_lock| Self::set_lock_unchecked(staker, new_lock))694 .ok_or(ArithmeticError::Overflow.into())695 }696697 /// Sets the new state of a balance locked by the pallet.698 ///699 /// - `staker`: staker account.700 /// - `amount`: amount of locked funds.701 fn set_lock_unchecked(staker: &T::AccountId, amount: BalanceOf<T>) {702 if amount.is_zero() {703 <T::Currency as LockableCurrency<T::AccountId>>::remove_lock(LOCK_IDENTIFIER, &staker);704 } else {705 <T::Currency as LockableCurrency<T::AccountId>>::set_lock(706 LOCK_IDENTIFIER,707 staker,708 amount,709 WithdrawReasons::all(),710 )711 }712 }713714 /// Returns the balance locked by the pallet for the staker.715 ///716 /// - `staker`: staker account.717 pub fn get_locked_balance(718 staker: impl EncodeLike<T::AccountId>,719 ) -> Option<BalanceLock<BalanceOf<T>>> {720 <T::Currency as ExtendedLockableCurrency<T::AccountId>>::locks(staker)721 .into_iter()722 .find(|l| l.id == LOCK_IDENTIFIER)723 }724725 /// Returns the total staked balance for the staker.726 ///727 /// - `staker`: staker account.728 pub fn total_staked_by_id(staker: impl EncodeLike<T::AccountId>) -> Option<BalanceOf<T>> {729 let staked = Staked::<T>::iter_prefix((staker,))730 .into_iter()731 .fold(<BalanceOf<T>>::default(), |acc, (_, (amount, _))| {732 acc + amount733 });734 if staked != <BalanceOf<T>>::default() {735 Some(staked)736 } else {737 None738 }739 }740741 /// Returns all relay block numbers when stake was made,742 /// the amount of the stake.743 ///744 /// - `staker`: staker account.745 pub fn total_staked_by_id_per_block(746 staker: impl EncodeLike<T::AccountId>,747 ) -> Option<Vec<(T::BlockNumber, BalanceOf<T>)>> {748 let mut staked = Staked::<T>::iter_prefix((staker,))749 .into_iter()750 .map(|(block, (amount, _))| (block, amount))751 .collect::<Vec<_>>();752 staked.sort_by_key(|(block, _)| *block);753 if !staked.is_empty() {754 Some(staked)755 } else {756 None757 }758 }759760 /// Returns the total staked balance for the staker.761 /// If `staker` is `None`, returns the total amount staked.762 /// - `staker`: staker account.763 pub fn cross_id_total_staked(staker: Option<T::CrossAccountId>) -> Option<BalanceOf<T>> {764 staker.map_or(Some(<TotalStaked<T>>::get()), |s| {765 Self::total_staked_by_id(s.as_sub())766 })767 }768769 // pub fn cross_id_locked_balance(staker: T::CrossAccountId) -> BalanceOf<T> {770 // Self::get_locked_balance(staker.as_sub())771 // .map(|l| l.amount)772 // .unwrap_or_default()773 // }774775 /// Returns all relay block numbers when stake was made,776 /// the amount of the stake.777 ///778 /// - `staker`: staker account.779 pub fn cross_id_total_staked_per_block(780 staker: T::CrossAccountId,781 ) -> Vec<(T::BlockNumber, BalanceOf<T>)> {782 Self::total_staked_by_id_per_block(staker.as_sub()).unwrap_or_default()783 }784785 fn recalculate_and_insert_stake(786 staker: &T::AccountId,787 staked_block: T::BlockNumber,788 next_recalc_block: T::BlockNumber,789 base: BalanceOf<T>,790 iters: u32,791 income_acc: &mut BalanceOf<T>,792 ) {793 let income = Self::calculate_income(base, iters);794795 base.checked_add(&income).map(|res| {796 <Staked<T>>::insert((staker, staked_block), (res, next_recalc_block));797 *income_acc += income;798 });799 }800801 fn calculate_income<I>(base: I, iters: u32) -> I802 where803 I: EncodeLike<BalanceOf<T>> + Balance,804 {805 let mut income = base;806807 (0..iters).for_each(|_| income += T::IntervalIncome::get() * income);808809 income - base810 }811812 fn get_current_recalc_block(current_relay_block: T::BlockNumber) -> T::BlockNumber {813 (current_relay_block / T::RecalculationInterval::get()) * T::RecalculationInterval::get()814 }815816 fn get_next_calculated_key() -> Option<Vec<u8>> {817 Self::get_next_calculated_record().map(|key| Staked::<T>::hashed_key_for(key))818 }819}820821impl<T: Config> Pallet<T>822where823 <<T as Config>::Currency as Currency<T::AccountId>>::Balance: Sum,824{825 /// Returns the amount reserved by the pending.826 /// If `staker` is `None`, returns the total pending.827 ///828 /// -`staker`: staker account.829 ///830 /// Since user funds are not transferred anywhere by staking, overflow protection is provided831 /// at the level of the associated type `Balance` of `Currency` trait. In order to overflow,832 /// the staker must have more funds on his account than the maximum set for `Balance` type.833 pub fn cross_id_pending_unstake(staker: Option<T::CrossAccountId>) -> BalanceOf<T> {834 staker.map_or(835 PendingUnstake::<T>::iter_values()836 .flat_map(|pendings| pendings.into_iter().map(|(_, amount)| amount))837 .sum(),838 |s| {839 PendingUnstake::<T>::iter_values()840 .flatten()841 .filter_map(|(id, amount)| {842 if id == *s.as_sub() {843 Some(amount)844 } else {845 None846 }847 })848 .sum()849 },850 )851 }852853 /// Returns all parachain block numbers when unreserve is expected,854 /// the amount of the unreserved funds.855 ///856 /// - `staker`: staker account.857 pub fn cross_id_pending_unstake_per_block(858 staker: T::CrossAccountId,859 ) -> Vec<(T::BlockNumber, BalanceOf<T>)> {860 let mut unsorted_res = vec![];861 PendingUnstake::<T>::iter().for_each(|(block, pendings)| {862 pendings.into_iter().for_each(|(id, amount)| {863 if id == *staker.as_sub() {864 unsorted_res.push((block, amount));865 };866 })867 });868869 unsorted_res.sort_by_key(|(block, _)| *block);870 unsorted_res871 }872}runtime/common/mod.rsdiffbeforeafterboth--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -82,7 +82,7 @@
pub type SignedExtra = (
frame_system::CheckSpecVersion<Runtime>,
- // system::CheckTxVersion<Runtime>,
+ frame_system::CheckTxVersion<Runtime>,
frame_system::CheckGenesis<Runtime>,
frame_system::CheckEra<Runtime>,
frame_system::CheckNonce<Runtime>,
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -50,7 +50,7 @@
spec_name: create_runtime_str!(RUNTIME_NAME),
impl_name: create_runtime_str!(RUNTIME_NAME),
authoring_version: 1,
- spec_version: 927020,
+ spec_version: 927030,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 2,
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -50,7 +50,7 @@
spec_name: create_runtime_str!(RUNTIME_NAME),
impl_name: create_runtime_str!(RUNTIME_NAME),
authoring_version: 1,
- spec_version: 927020,
+ spec_version: 927030,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 2,
runtime/unique/src/lib.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -50,7 +50,7 @@
spec_name: create_runtime_str!(RUNTIME_NAME),
impl_name: create_runtime_str!(RUNTIME_NAME),
authoring_version: 1,
- spec_version: 927020,
+ spec_version: 927030,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 2,
tests/src/app-promotion.test.tsdiffbeforeafterboth--- a/tests/src/app-promotion.test.ts
+++ b/tests/src/app-promotion.test.ts
@@ -661,6 +661,26 @@
});
});
+ it('should increase total staked', async() => {
+ await usingPlaygrounds(async (helper) => {
+ const staker = accounts.pop()!;
+ const totalStakedBefore = await helper.staking.getTotalStaked();
+ await helper.staking.stake(staker, 100n * nominal);
+
+ // Wait for rewards and pay
+ const stakedInBlock = (await helper.staking.getTotalStakedPerBlock({Substrate: staker.address}))[0][0];
+ await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stakedInBlock));
+ await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+
+ const totalStakedAfter = await helper.staking.getTotalStaked();
+ expect(totalStakedAfter >= totalStakedBefore + calculateIncome(100n * nominal, 10n)).to.be.true;
+
+ // staker can unstake
+ await helper.staking.unstake(staker);
+ expect(await helper.staking.getTotalStaked()).to.be.equal(totalStakedAfter - calculateIncome(100n * nominal, 10n));
+ });
+ });
+
it('should credit 0.05% for staking period', async () => {
await usingPlaygrounds(async helper => {
const staker = accounts.pop()!;
tests/src/tx-version-presence.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/tx-version-presence.test.ts
@@ -0,0 +1,32 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+import { Metadata } from '@polkadot/types';
+import {itSub, usingPlaygrounds, expect} from './util/playgrounds';
+
+let metadata: Metadata;
+
+describe('TxVersion is present', () => {
+ before(async () => {
+ await usingPlaygrounds(async helper => {
+ metadata = await helper.api!.rpc.state.getMetadata();
+ });
+ });
+
+ itSub('Signed extension CheckTxVersion is present', async () => {
+ expect(metadata.asLatest.extrinsic.signedExtensions.map(se => se.identifier.toString())).to.include('CheckTxVersion');
+ });
+});