diff --git a/Cargo.lock b/Cargo.lock index a548deca91..4e9e5bcfdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10515,6 +10515,7 @@ dependencies = [ "orml-tokens", "orml-traits", "orml-xtokens", + "pallet-account-fix", "pallet-asset-manager", "pallet-aura", "pallet-authorship", diff --git a/runtime/litentry/src/lib.rs b/runtime/litentry/src/lib.rs index e82fdf1278..7158892b06 100644 --- a/runtime/litentry/src/lib.rs +++ b/runtime/litentry/src/lib.rs @@ -996,7 +996,9 @@ impl Contains for NormalModeFilter { // Identity RuntimeCall::ParachainIdentity(_) | // Balance - RuntimeCall::Balances(_) + RuntimeCall::Balances(_) | + // AccountFix + RuntimeCall::AccountFix(_) ) } } diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml index 9ce0f6106b..e5593685ef 100644 --- a/runtime/rococo/Cargo.toml +++ b/runtime/rococo/Cargo.toml @@ -86,6 +86,7 @@ frame-benchmarking = { git = "https://github.com/paritytech/substrate", default- frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42", optional = true } # Rococo pallets +pallet-account-fix = { path = "../../pallets/account-fix", default-features = false } pallet-asset-manager = { path = "../../pallets/xcm-asset-manager", default-features = false } pallet-bridge = { path = "../../pallets/bridge", default-features = false } pallet-bridge-transfer = { path = "../../pallets/bridge-transfer", default-features = false } @@ -179,6 +180,7 @@ runtime-benchmarks = [ "pallet-sidechain/runtime-benchmarks", "pallet-teeracle/runtime-benchmarks", "pallet-vc-management/runtime-benchmarks", + "pallet-account-fix/runtime-benchmarks", ] std = [ "codec/std", @@ -268,6 +270,7 @@ std = [ "pallet-sidechain/std", "pallet-teeracle/std", "pallet-vc-management/std", + "pallet-account-fix/std", "moonbeam-evm-tracer/std", "moonbeam-rpc-primitives-debug/std", "moonbeam-rpc-primitives-txpool/std", @@ -323,4 +326,5 @@ try-runtime = [ "pallet-vesting/try-runtime", "pallet-xcm/try-runtime", "parachain-info/try-runtime", + "pallet-account-fix/try-runtime", ] diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 5d991f2eb9..069c4fa555 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -245,7 +245,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("rococo-parachain"), authoring_version: 1, // same versioning-mechanism as polkadot: use last digit for minor updates - spec_version: 9172, + spec_version: 9173, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -775,6 +775,10 @@ impl pallet_sudo::Config for Runtime { type RuntimeEvent = RuntimeEvent; } +impl pallet_account_fix::Config for Runtime { + type Currency = Balances; +} + parameter_types! { pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4); @@ -1257,6 +1261,7 @@ construct_runtime! { Ethereum: pallet_ethereum = 121, // TMP + AccountFix: pallet_account_fix = 254, Sudo: pallet_sudo = 255, } } @@ -1344,7 +1349,9 @@ impl Contains for NormalModeFilter { // EVM // Substrate EVM extrinsic not allowed // So no EVM pallet - RuntimeCall::Ethereum(_) + RuntimeCall::Ethereum(_) | + // AccountFix + RuntimeCall::AccountFix(_) ) } } diff --git a/tee-worker/Cargo.lock b/tee-worker/Cargo.lock index d169e2cd36..151af2fadf 100644 --- a/tee-worker/Cargo.lock +++ b/tee-worker/Cargo.lock @@ -8592,6 +8592,21 @@ dependencies = [ "libm 0.1.4", ] +[[package]] +name = "pallet-account-fix" +version = "0.1.0" +dependencies = [ + "frame-support", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.42)", + "sp-runtime", + "sp-std 5.0.0", +] + [[package]] name = "pallet-asset-manager" version = "0.1.0" @@ -11160,6 +11175,7 @@ dependencies = [ "orml-tokens", "orml-traits", "orml-xtokens", + "pallet-account-fix", "pallet-asset-manager", "pallet-aura", "pallet-authorship", diff --git a/tee-worker/app-libs/sgx-runtime/src/lib.rs b/tee-worker/app-libs/sgx-runtime/src/lib.rs index 9f94fe2d99..0c2c5f715a 100644 --- a/tee-worker/app-libs/sgx-runtime/src/lib.rs +++ b/tee-worker/app-libs/sgx-runtime/src/lib.rs @@ -139,7 +139,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("node-template"), impl_name: create_runtime_str!("node-template"), authoring_version: 1, - spec_version: 102, + spec_version: 103, impl_version: 1, apis: RUNTIME_API_VERSIONS, transaction_version: 1,