mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-04-29 14:57:56 +00:00
fef9723d65
* contracts: refactor currency to use fungible traits * contracts: refactor currency to use fungible traits * contracts: add minor improvements * contracts: max holds config set * contracts: fix some typos * contracts: map token errors * fix typo * contracts: add 0 balance transfer to test * contracts: not transfer if value is zero * contracts: [WIP] add StorageDepositHold * contracts: add storage deposit held event * contracts: clean up some code and comments * contracts: add deposit storage released event * contracts: update comment * contracts: update slash cannot kill account test * contracts: fix tests * contracts: add some comments to the slashing test * contracts: add some comments to the slashing test * contracts: remove references to Currency * contracts: do not transfer if from equals to * bound BalanceOf<T> * added FixedPointOperand to Balance trait * move migrate sequence to config * remove commented out code * Update frame/contracts/src/lib.rs Co-authored-by: PG Herveou <pgherveou@gmail.com> * remove Migrations generic * make runtime use noop migrations * restrict is_upgrade_supported * undo is_upgrade_supported change * Update bin/node/runtime/src/lib.rs Co-authored-by: PG Herveou <pgherveou@gmail.com> * add rust doc example for `Migrations` * feature gate NoopMigration * fix example code * improve example * wip * remove FixedPointOperand from trait * trait bound BalanceOf * more trait bound BalanceOf * update to use RuntimeHoldReason * replace Fungible for Currency * update runtime * WIP * make v10 benchmark generic over currency * solve merge conflicts * make v12 migration benchmarking generic over DepositPerItem and DepositPerByte * give some format * fix tests and old migrations * add migration v13 placholder * wip * wip * add benchmarking * add weights * wip * [pallet_collective] Enforce prime is a valid member of collective in set_members extrinsic (#14354) * Updated set_members extrinsic to enforce prime is valid member of collective * Added additional tests for set_members extrinsic * applied the code review suggestions * update to docify 0.2.0 / crate-relative embed paths (#14570) * Fix Society v2 migration (#14421) * fix society v2 migration * Update frame/society/src/migrations.rs * Update frame/society/src/migrations.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Update frame/society/src/migrations.rs Co-authored-by: Bastian Köcher <git@kchr.de> * update for versioned upgrade * fix society v2 migration * remove references to members being sorted from commnets * fix type * fix can_migrate check * add sanity log * fix sanity check * kick ci * kick ci * run tests with --experimental flag * versioned migration cleanup * revert pipeline change * use defensive! * semicolons * defensive and doc comment * address pr comment * feature gate the versioned migration * defensive_unwrap_or * fix test * fix doc comment * change defensive to a log warning * remove can_migrate anti-pattern * Update frame/society/Cargo.toml Co-authored-by: Bastian Köcher <git@kchr.de> * add experimental feature warning to doc comment * update doc comment * bump ci * kick ci * kick ci * kick ci --------- Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> Co-authored-by: Bastian Köcher <git@kchr.de> * Moves `Block` to `frame_system` instead of `construct_runtime` and removes `Header` and `BlockNumber` (#14437) * Initial setup * Adds node block * Uses UncheckedExtrinsic and removes Where section * Updates frame_system to use Block * Adds deprecation warning * Fixes pallet-timestamp * Removes Header and BlockNumber * Addresses review comments * Addresses review comments * Adds comment about compiler bug * Removes where clause * Refactors code * Fixes errors in cargo check * Fixes errors in cargo check * Fixes warnings in cargo check * Formatting * Fixes construct_runtime tests * Uses import instead of full path for BlockNumber * Uses import instead of full path for Header * Formatting * Fixes construct_runtime tests * Fixes imports in benchmarks * Formatting * Fixes construct_runtime tests * Formatting * Minor updates * Fixes construct_runtime ui tests * Fixes construct_runtime ui tests with 1.70 * Fixes docs * Fixes docs * Adds u128 mock block type * Fixes split example * fixes for cumulus * ".git/.scripts/commands/fmt/fmt.sh" * Updates new tests * Fixes fully-qualified path in few places * Formatting * Update frame/examples/default-config/src/lib.rs Co-authored-by: Juan <juangirini@gmail.com> * Update frame/support/procedural/src/construct_runtime/mod.rs Co-authored-by: Juan <juangirini@gmail.com> * ".git/.scripts/commands/fmt/fmt.sh" * Addresses some review comments * Fixes build * ".git/.scripts/commands/fmt/fmt.sh" * Update frame/democracy/src/lib.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update frame/democracy/src/lib.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update frame/support/procedural/src/construct_runtime/mod.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update frame/support/procedural/src/construct_runtime/mod.rs Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Addresses review comments * Updates trait bounds * Minor fix * ".git/.scripts/commands/fmt/fmt.sh" * Removes unnecessary bound * ".git/.scripts/commands/fmt/fmt.sh" * Updates test * Fixes build * Adds a bound for header * ".git/.scripts/commands/fmt/fmt.sh" * Removes where block * Minor fix * Minor fix * Fixes tests * ".git/.scripts/commands/update-ui/update-ui.sh" 1.70 * Updates test * Update primitives/runtime/src/traits.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Update primitives/runtime/src/traits.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Updates doc * Updates doc --------- Co-authored-by: command-bot <> Co-authored-by: Juan <juangirini@gmail.com> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Bastian Köcher <git@kchr.de> * Refactor the asset-conversion-tx-payment pallet (#14558) * Code refactoring * Fix imports * Typo * Update frame/asset-conversion/src/types.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Sync docs --------- Co-authored-by: parity-processbot <> Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * wip * wip * wip * improve try-runtime imports * fix benchmark test * improved rustdocs * improved rustdocs * remove log * ignore variable * reduce caller funding * move v13 out * update v13 migration * v13 migration * benchmark v13_migration * fix broken compilation * ".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime=dev --target_dir=substrate --pallet=pallet_contracts * remove all the `where BalanceOf` * add Balance to Config * improve docs * add new deposit storage error * remove todo message * rename migration v13 pre rebase * fix tests * add missing migration; * bump storage version * apply review suggestions * improved comment * remove unnecessary code * simplify migrations * mock balance * mock more for benchmarks * fix benchmarking tests * fix benchmarking tests with caller * improve cargo toml * solve nit * Update frame/contracts/src/lib.rs Co-authored-by: Alexander Theißen <alex.theissen@me.com> * Update frame/contracts/src/exec.rs Co-authored-by: Alexander Theißen <alex.theissen@me.com> * Update frame/contracts/src/exec.rs Co-authored-by: Alexander Theißen <alex.theissen@me.com> * Update frame/contracts/src/storage/meter.rs Co-authored-by: Alexander Theißen <alex.theissen@me.com> * review improvements * remove extra events * update cargo * undo update cargo * review updates * remove type Balance * add extra fields to events * fix zepter ci --------- Co-authored-by: PG Herveou <pgherveou@gmail.com> Co-authored-by: Toufeeq Pasha <47236805+ToufeeqP@users.noreply.github.com> Co-authored-by: Sam Johnson <sam@durosoft.com> Co-authored-by: Liam Aharon <liam.aharon@hotmail.com> Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: gupnik <17176722+gupnik@users.noreply.github.com> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Jegor Sidorenko <5252494+jsidorenko@users.noreply.github.com> Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> Co-authored-by: command-bot <> Co-authored-by: Alexander Theißen <alex.theissen@me.com>
270 lines
7.8 KiB
Rust
270 lines
7.8 KiB
Rust
// This file is part of Substrate.
|
|
|
|
// Copyright (C) Parity Technologies (UK) Ltd.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
//! Update the code owner balance, make the storage deposit reserved balance to be held instead.
|
|
|
|
use crate::{
|
|
exec::AccountIdOf,
|
|
migration::{IsFinished, MigrationStep},
|
|
weights::WeightInfo,
|
|
BalanceOf, CodeHash, Config, Determinism, HoldReason, Pallet, Weight, LOG_TARGET,
|
|
};
|
|
use codec::{Decode, Encode};
|
|
#[cfg(feature = "try-runtime")]
|
|
use environmental::Vec;
|
|
#[cfg(feature = "try-runtime")]
|
|
use frame_support::traits::fungible::{Inspect, InspectHold};
|
|
use frame_support::{
|
|
codec,
|
|
pallet_prelude::*,
|
|
storage_alias,
|
|
traits::{fungible::MutateHold, ReservableCurrency},
|
|
DefaultNoBound,
|
|
};
|
|
use sp_core::hexdisplay::HexDisplay;
|
|
#[cfg(feature = "try-runtime")]
|
|
use sp_runtime::TryRuntimeError;
|
|
use sp_runtime::{traits::Zero, Saturating};
|
|
#[cfg(feature = "try-runtime")]
|
|
use sp_std::collections::btree_map::BTreeMap;
|
|
|
|
mod old {
|
|
use super::*;
|
|
|
|
pub type BalanceOf<T, OldCurrency> = <OldCurrency as frame_support::traits::Currency<
|
|
<T as frame_system::Config>::AccountId,
|
|
>>::Balance;
|
|
|
|
#[derive(Encode, Decode, scale_info::TypeInfo, MaxEncodedLen)]
|
|
#[codec(mel_bound())]
|
|
#[scale_info(skip_type_params(T, OldCurrency))]
|
|
pub struct CodeInfo<T, OldCurrency>
|
|
where
|
|
T: Config,
|
|
OldCurrency: ReservableCurrency<<T as frame_system::Config>::AccountId>,
|
|
{
|
|
pub owner: AccountIdOf<T>,
|
|
#[codec(compact)]
|
|
pub deposit: old::BalanceOf<T, OldCurrency>,
|
|
#[codec(compact)]
|
|
pub refcount: u64,
|
|
pub determinism: Determinism,
|
|
pub code_len: u32,
|
|
}
|
|
|
|
#[storage_alias]
|
|
pub type CodeInfoOf<T: Config, OldCurrency> =
|
|
StorageMap<Pallet<T>, Twox64Concat, CodeHash<T>, CodeInfo<T, OldCurrency>>;
|
|
}
|
|
|
|
#[cfg(feature = "runtime-benchmarks")]
|
|
pub fn store_dummy_code<T: Config, OldCurrency>(account: T::AccountId)
|
|
where
|
|
T: Config,
|
|
OldCurrency: ReservableCurrency<<T as frame_system::Config>::AccountId> + 'static,
|
|
{
|
|
use sp_runtime::traits::Hash;
|
|
use sp_std::vec;
|
|
|
|
let len = T::MaxCodeLen::get();
|
|
let code = vec![42u8; len as usize];
|
|
let hash = T::Hashing::hash(&code);
|
|
|
|
let info = old::CodeInfo {
|
|
owner: account,
|
|
deposit: 10_000u32.into(),
|
|
refcount: u64::MAX,
|
|
determinism: Determinism::Enforced,
|
|
code_len: len,
|
|
};
|
|
old::CodeInfoOf::<T, OldCurrency>::insert(hash, info);
|
|
}
|
|
|
|
#[cfg(feature = "try-runtime")]
|
|
#[derive(Encode, Decode)]
|
|
/// Accounts for the balance allocation of a code owner.
|
|
struct BalanceAllocation<T, OldCurrency>
|
|
where
|
|
T: Config,
|
|
OldCurrency: ReservableCurrency<<T as frame_system::Config>::AccountId>,
|
|
{
|
|
/// Total reserved balance as storage deposit for the owner.
|
|
reserved: old::BalanceOf<T, OldCurrency>,
|
|
/// Total balance of the owner.
|
|
total: old::BalanceOf<T, OldCurrency>,
|
|
}
|
|
|
|
#[derive(Encode, Decode, MaxEncodedLen, DefaultNoBound)]
|
|
pub struct Migration<T, OldCurrency>
|
|
where
|
|
T: Config,
|
|
OldCurrency: ReservableCurrency<<T as frame_system::Config>::AccountId>,
|
|
{
|
|
last_code_hash: Option<CodeHash<T>>,
|
|
_phantom: PhantomData<(T, OldCurrency)>,
|
|
}
|
|
|
|
impl<T, OldCurrency> MigrationStep for Migration<T, OldCurrency>
|
|
where
|
|
T: Config,
|
|
OldCurrency: 'static + ReservableCurrency<<T as frame_system::Config>::AccountId>,
|
|
BalanceOf<T>: From<OldCurrency::Balance>,
|
|
{
|
|
const VERSION: u16 = 14;
|
|
|
|
fn max_step_weight() -> Weight {
|
|
T::WeightInfo::v14_migration_step()
|
|
}
|
|
|
|
fn step(&mut self) -> (IsFinished, Weight) {
|
|
let mut iter = if let Some(last_hash) = self.last_code_hash.take() {
|
|
old::CodeInfoOf::<T, OldCurrency>::iter_from(
|
|
old::CodeInfoOf::<T, OldCurrency>::hashed_key_for(last_hash),
|
|
)
|
|
} else {
|
|
old::CodeInfoOf::<T, OldCurrency>::iter()
|
|
};
|
|
|
|
if let Some((hash, code_info)) = iter.next() {
|
|
log::debug!(target: LOG_TARGET, "Migrating storage deposit for 0x{:?}", HexDisplay::from(&code_info.owner.encode()));
|
|
|
|
let remaining = OldCurrency::unreserve(&code_info.owner, code_info.deposit);
|
|
|
|
if remaining > Zero::zero() {
|
|
log::warn!(
|
|
target: LOG_TARGET,
|
|
"Code owner's account 0x{:?} for code {:?} has some non-unreservable deposit {:?} from a total of {:?} that will remain in reserved.",
|
|
HexDisplay::from(&code_info.owner.encode()),
|
|
hash,
|
|
remaining,
|
|
code_info.deposit
|
|
);
|
|
}
|
|
|
|
let unreserved = code_info.deposit.saturating_sub(remaining);
|
|
let amount = BalanceOf::<T>::from(unreserved);
|
|
|
|
log::debug!(
|
|
target: LOG_TARGET,
|
|
"Holding {:?} on the code owner's account 0x{:?} for code {:?}.",
|
|
amount,
|
|
HexDisplay::from(&code_info.owner.encode()),
|
|
hash,
|
|
);
|
|
|
|
T::Currency::hold(
|
|
&HoldReason::CodeUploadDepositReserve.into(),
|
|
&code_info.owner,
|
|
amount,
|
|
)
|
|
.unwrap_or_else(|err| {
|
|
log::error!(
|
|
target: LOG_TARGET,
|
|
"Failed to hold {:?} from the code owner's account 0x{:?} for code {:?}, reason: {:?}.",
|
|
amount,
|
|
HexDisplay::from(&code_info.owner.encode()),
|
|
hash,
|
|
err
|
|
);
|
|
});
|
|
|
|
self.last_code_hash = Some(hash);
|
|
(IsFinished::No, T::WeightInfo::v14_migration_step())
|
|
} else {
|
|
log::debug!(target: LOG_TARGET, "No more storage deposit to migrate");
|
|
(IsFinished::Yes, T::WeightInfo::v14_migration_step())
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "try-runtime")]
|
|
fn pre_upgrade_step() -> Result<Vec<u8>, TryRuntimeError> {
|
|
let info: Vec<_> = old::CodeInfoOf::<T, OldCurrency>::iter().collect();
|
|
|
|
let mut owner_balance_allocation =
|
|
BTreeMap::<AccountIdOf<T>, BalanceAllocation<T, OldCurrency>>::new();
|
|
|
|
// Calculates the balance allocation by accumulating the storage deposits of all codes owned
|
|
// by an owner.
|
|
for (_, code_info) in info {
|
|
owner_balance_allocation
|
|
.entry(code_info.owner.clone())
|
|
.and_modify(|alloc| {
|
|
alloc.reserved = alloc.reserved.saturating_add(code_info.deposit);
|
|
})
|
|
.or_insert(BalanceAllocation {
|
|
reserved: code_info.deposit,
|
|
total: OldCurrency::total_balance(&code_info.owner),
|
|
});
|
|
}
|
|
|
|
Ok(owner_balance_allocation.encode())
|
|
}
|
|
|
|
#[cfg(feature = "try-runtime")]
|
|
fn post_upgrade_step(state: Vec<u8>) -> Result<(), TryRuntimeError> {
|
|
let owner_balance_allocation =
|
|
<BTreeMap<AccountIdOf<T>, BalanceAllocation<T, OldCurrency>> as Decode>::decode(
|
|
&mut &state[..],
|
|
)
|
|
.expect("pre_upgrade_step provides a valid state; qed");
|
|
|
|
let mut total_held: BalanceOf<T> = Zero::zero();
|
|
let count = owner_balance_allocation.len();
|
|
for (owner, old_balance_allocation) in owner_balance_allocation {
|
|
let held =
|
|
T::Currency::balance_on_hold(&HoldReason::CodeUploadDepositReserve.into(), &owner);
|
|
log::debug!(
|
|
target: LOG_TARGET,
|
|
"Validating storage deposit for owner 0x{:?}, reserved: {:?}, held: {:?}",
|
|
HexDisplay::from(&owner.encode()),
|
|
old_balance_allocation.reserved,
|
|
held
|
|
);
|
|
ensure!(held == old_balance_allocation.reserved.into(), "Held amount mismatch");
|
|
|
|
log::debug!(
|
|
target: LOG_TARGET,
|
|
"Validating total balance for owner 0x{:?}, new: {:?}, old: {:?}",
|
|
HexDisplay::from(&owner.encode()),
|
|
T::Currency::total_balance(&owner),
|
|
old_balance_allocation.total
|
|
);
|
|
ensure!(
|
|
T::Currency::total_balance(&owner) ==
|
|
BalanceOf::<T>::decode(&mut &old_balance_allocation.total.encode()[..])
|
|
.unwrap(),
|
|
"Balance mismatch "
|
|
);
|
|
total_held += held;
|
|
}
|
|
|
|
log::info!(
|
|
target: LOG_TARGET,
|
|
"Code owners processed: {:?}.",
|
|
count
|
|
);
|
|
|
|
log::info!(
|
|
target: LOG_TARGET,
|
|
"Total held amount for storage deposit: {:?}",
|
|
total_held
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
}
|