Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Contracts Rollback StorageMap hashing migration #14661

Merged
merged 2 commits into from
Jul 28, 2023
Merged

Contracts Rollback StorageMap hashing migration #14661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3796ab
Contracts Rollback StorageMap hashing migration
pgherveou Jul 27, 2023
4110961
misc v13
pgherveou Jul 27, 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 frame/contracts/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ pub mod pallet {

/// The current storage version.
#[cfg(not(any(test, feature = "runtime-benchmarks")))]
const STORAGE_VERSION: StorageVersion = StorageVersion::new(12);
const STORAGE_VERSION: StorageVersion = StorageVersion::new(13);

/// Hard coded storage version for running tests that depend on the current storage version.
#[cfg(any(test, feature = "runtime-benchmarks"))]
Expand Down Expand Up @@ -1022,7 +1022,7 @@ pub mod pallet {
/// TWOX-NOTE: SAFE since `AccountId` is a secure hash.
#[pallet::storage]
pub(crate) type ContractInfoOf<T: Config> =
StorageMap<_, Identity, T::AccountId, ContractInfo<T>>;
StorageMap<_, Twox64Concat, T::AccountId, ContractInfo<T>>;

/// Evicted contracts that await child trie deletion.
///
Expand Down
3 changes: 1 addition & 2 deletions frame/contracts/src/migration/v13.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// limitations under the License.

//! Add `delegate_dependencies` to `ContractInfo`.
//! Use `Identity` instead of `Twox64Concat` for hashing keys of the `ContractInfoOf` storage map
//! See <https:/paritytech/substrate/pull/14079>.

use crate::{
Expand Down Expand Up @@ -74,7 +73,7 @@ pub fn store_old_contract_info<T: Config>(account: T::AccountId, info: crate::Co

#[storage_alias]
pub type ContractInfoOf<T: Config> =
StorageMap<Pallet<T>, Identity, <T as frame_system::Config>::AccountId, ContractInfo<T>>;
StorageMap<Pallet<T>, Twox64Concat, <T as frame_system::Config>::AccountId, ContractInfo<T>>;

#[derive(Encode, Decode, CloneNoBound, PartialEq, Eq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
#[scale_info(skip_type_params(T))]
Expand Down
Loading