mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-11-19 17:16:09 +00:00
Contracts: Remove ED from base deposit (#3536)
- Update internal logic so that the storage_base_deposit does not include ED - add v16 migration to update ContractInfo struct with this change Before: <img width="820" alt="Screenshot 2024-03-21 at 11 23 29" src="https://github.com/paritytech/polkadot-sdk/assets/521091/a0a8df0d-e743-42c5-9e16-cf2ec1aa949c"> After:  --------- Co-authored-by: Cyrill Leutwiler <cyrill@parity.io> Co-authored-by: command-bot <>
This commit is contained in:
8 files changed
+174
-42
No files matched your search
@@ -23,7 +23,7 @@ use crate::{
|
||||
exec::{AccountIdOf, Key},
|
||||
weights::WeightInfo,
|
||||
BalanceOf, CodeHash, CodeInfo, Config, ContractInfoOf, DeletionQueue, DeletionQueueCounter,
|
||||
Error, Pallet, TrieId, SENTINEL,
|
||||
Error, TrieId, SENTINEL,
|
||||
};
|
||||
use codec::{Decode, Encode, MaxEncodedLen};
|
||||
use frame_support::{
|
||||
@@ -125,9 +125,7 @@ impl<T: Config> ContractInfo<T> {
|
||||
|
||||
/// Same as [`Self::extra_deposit`] but including the base deposit.
|
||||
pub fn total_deposit(&self) -> BalanceOf<T> {
|
||||
self.extra_deposit()
|
||||
.saturating_add(self.storage_base_deposit)
|
||||
.saturating_sub(Pallet::<T>::min_balance())
|
||||
self.extra_deposit().saturating_add(self.storage_base_deposit)
|
||||
}
|
||||
|
||||
/// Returns the storage base deposit of the contract.
|
||||
@@ -213,7 +211,6 @@ impl<T: Config> ContractInfo<T> {
|
||||
/// The base deposit is updated when the `code_hash` of the contract changes, as it depends on
|
||||
/// the deposit paid to upload the contract's code.
|
||||
pub fn update_base_deposit(&mut self, code_info: &CodeInfo<T>) -> BalanceOf<T> {
|
||||
let ed = Pallet::<T>::min_balance();
|
||||
let info_deposit =
|
||||
Diff { bytes_added: self.encoded_size() as u32, items_added: 1, ..Default::default() }
|
||||
.update_contract::<T>(None)
|
||||
@@ -224,11 +221,7 @@ impl<T: Config> ContractInfo<T> {
|
||||
// to prevent abuse.
|
||||
let upload_deposit = T::CodeHashLockupDepositPercent::get().mul_ceil(code_info.deposit());
|
||||
|
||||
// Instantiate needs to transfer at least the minimum balance in order to pull the
|
||||
// contract's own account into existence, as the deposit itself does not contribute to the
|
||||
// `ed`.
|
||||
let deposit = info_deposit.saturating_add(upload_deposit).saturating_add(ed);
|
||||
|
||||
let deposit = info_deposit.saturating_add(upload_deposit);
|
||||
self.storage_base_deposit = deposit;
|
||||
deposit
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user