Skip to content

Commit

Permalink
fix XCM token key padding (#252)
Browse files Browse the repository at this point in the history
* fix XCM token zero padding

* remove applied migrations

* bump spec version
  • Loading branch information
brenzi authored Jan 26, 2024
1 parent 4e5e23d commit 4f6d486
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 404 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion polkadot-parachains/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "integritee-collator"
description = "The Integritee parachain collator binary"
# align major.minor revision with the runtimes. bump patch revision ad lib. make this the github release tag
version = "1.7.5"
version = "1.7.6"
authors = ["Integritee AG <[email protected]>"]
homepage = "https://integritee.network/"
repository = "https://github.com/integritee-network/parachain"
Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/integritee-runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "integritee-runtime"
description = "The Integritee parachain runtime"
# patch revision must match runtime spec_version
version = "1.7.42"
version = "1.7.43"
authors = ["Integritee AG <[email protected]>"]
homepage = "https://integritee.network/"
repository = "https://github.com/integritee-network/parachain"
Expand Down
23 changes: 4 additions & 19 deletions polkadot-parachains/integritee-runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));

use codec::{Decode, Encode, MaxEncodedLen};
use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
use frame_support::{
instances::{Instance1, Instance2},
traits::{ConstBool, EqualPrivilegeOnly, Imbalance, InstanceFilter, OnUnbalanced},
use frame_support::traits::{
ConstBool, EqualPrivilegeOnly, Imbalance, InstanceFilter, OnUnbalanced,
};
pub use opaque::*;
use pallet_collective;
Expand Down Expand Up @@ -93,9 +92,6 @@ pub use pallet_teerex::Call as TeerexCall;
mod helpers;
mod weights;

// todo: temporary. remove after fixing
mod migrations_fix;

pub mod xcm_config;

pub type SessionHandlers = ();
Expand Down Expand Up @@ -128,7 +124,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("integritee-parachain"),
impl_name: create_runtime_str!("integritee-full"),
authoring_version: 2,
spec_version: 42,
spec_version: 43,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 6,
Expand Down Expand Up @@ -823,18 +819,7 @@ pub type UncheckedExtrinsic =
pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;

/// Migrations to apply on runtime upgrade.
pub type Migrations = (
migrations_fix::preimage::v1::MigrateToV1<Runtime>,
migrations_fix::bounties::v4::MigrateToV4<Runtime>,
// Multisig
pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
// Collective
// migration changes the pallet name prefix (back in 2021). no need to touch this. I guess this has been left untouched when we migrated solo to para
// for consistency, we will bruteforce to V4
// future: v1.6.0 is still at V4.
migrations_fix::collective::v4::MigrateToV4<Runtime, CouncilInstance>,
migrations_fix::collective::v4::MigrateToV4<Runtime, TechnicalCommitteeInstance>,
);
pub type Migrations = ();

/// Executive: handles dispatch to the various modules.
pub type Executive = frame_executive::Executive<
Expand Down
Loading

0 comments on commit 4f6d486

Please sign in to comment.