Moonsong-Labs · snowmead · Mar 16, 2026 · Mar 16, 2026 · Mar 16, 2026 · Mar 17, 2026
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/api-augment/dist/types/parachain/interfaces/augment-api-errors.d.ts b/api-augment/dist/types/parachain/interfaces/augment-api-errors.d.ts
@@ -858,6 +858,11 @@ declare module '@polkadot/api-base/types/errors' {
              * Local XCM execution incomplete.
              **/
             LocalExecutionIncomplete: AugmentedError<ApiType>;
+            /**
+             * Local XCM execution incomplete with the actual XCM error and the index of the
+             * instruction that caused the error.
+             **/
+            LocalExecutionIncompleteWithError: AugmentedError<ApiType>;
             /**
              * A remote lock with the corresponding data could not be found.
              **/

diff --git a/api-augment/dist/types/parachain/interfaces/augment-api-events.d.ts b/api-augment/dist/types/parachain/interfaces/augment-api-events.d.ts
@@ -1679,6 +1679,11 @@ declare module '@polkadot/api-base/types/events' {
             [key: string]: AugmentedEvent<ApiType>;
         };
         session: {
+            /**
+             * The `NewSession` event in the current block also implies a new validator set to be
+             * queued.
+             **/
+            NewQueued: AugmentedEvent<ApiType, []>;
             /**
              * New session has happened. Note that the argument is the session index, not the
              * block number as the type might suggest.

diff --git a/api-augment/dist/types/parachain/interfaces/augment-api-runtime.d.ts b/api-augment/dist/types/parachain/interfaces/augment-api-runtime.d.ts
@@ -5,7 +5,6 @@ import type { AnyNumber, IMethod, ITuple } from '@polkadot/types-codec/types';
 import type { CheckInherentsResult, InherentData } from '@polkadot/types/interfaces/blockbuilder';
 import type { BlockHash } from '@polkadot/types/interfaces/chain';
 import type { AuthorityId } from '@polkadot/types/interfaces/consensus';
-import type { CollationInfo } from '@polkadot/types/interfaces/cumulus';
 import type { CallDryRunEffects, XcmDryRunApiError, XcmDryRunEffects } from '@polkadot/types/interfaces/dryRunApi';
 import type { Extrinsic } from '@polkadot/types/interfaces/extrinsics';
 import type { GenesisBuildErr } from '@polkadot/types/interfaces/genesisBuilder';
@@ -81,23 +80,6 @@ declare module '@polkadot/api-base/types/calls' {
              **/
             [key: string]: DecoratedCallBase<ApiType>;
         };
-        /** 0xea93e3f16f3d6962/2 */
-        collectCollationInfo: {
-            /**
-             * Collect information about a collation.
-             **/
-            collectCollationInfo: AugmentedCall<ApiType, (header: Header | {
-                parentHash?: any;
-                number?: any;
-                stateRoot?: any;
-                extrinsicsRoot?: any;
-                digest?: any;
-            } | string | Uint8Array) => Observable<CollationInfo>>;
-            /**
-             * Generic call
-             **/
-            [key: string]: DecoratedCallBase<ApiType>;
-        };
         /** 0xdf6acb689907609b/5 */
         core: {
             /**

diff --git a/api-augment/dist/types/parachain/interfaces/augment-api-tx.d.ts b/api-augment/dist/types/parachain/interfaces/augment-api-tx.d.ts
@@ -1464,6 +1464,8 @@ declare module '@polkadot/api-base/types/submittable' {
                 relayChainState?: any;
                 downwardMessages?: any;
                 horizontalMessages?: any;
+                relayParentDescendants?: any;
+                collatorPeerId?: any;
             } | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [CumulusPrimitivesParachainInherentParachainInherentData]>;
             sudoSendUpwardMessage: AugmentedSubmittable<(message: Bytes | string | Uint8Array) => SubmittableExtrinsic<ApiType>, [Bytes]>;
             /**

diff --git a/api-augment/dist/types/solochain-evm/interfaces/augment-api-events.d.ts b/api-augment/dist/types/solochain-evm/interfaces/augment-api-events.d.ts
@@ -556,6 +556,24 @@ declare module '@polkadot/api-base/types/events' {
              **/
             [key: string]: AugmentedEvent<ApiType>;
         };
+        historical: {
+            /**
+             * The merkle roots of up to this session index were pruned
+             **/
+            RootsPruned: AugmentedEvent<ApiType, [upTo: u32], {
+                upTo: u32;
+            }>;
+            /**
+             * The merkle root of the validators of the said session were stored
+             **/
+            RootStored: AugmentedEvent<ApiType, [index: u32], {
+                index: u32;
+            }>;
+            /**
+             * Generic event
+             **/
+            [key: string]: AugmentedEvent<ApiType>;
+        };
         nfts: {
             /**
              * All approvals of an item got cancelled.
@@ -1335,6 +1353,11 @@ declare module '@polkadot/api-base/types/events' {
             [key: string]: AugmentedEvent<ApiType>;
         };
         session: {
+            /**
+             * The `NewSession` event in the current block also implies a new validator set to be
+             * queued.
+             **/
+            NewQueued: AugmentedEvent<ApiType, []>;
             /**
              * New session has happened. Note that the argument is the session index, not the
              * block number as the type might suggest.

diff --git a/api-augment/src/parachain/interfaces/augment-api-errors.ts b/api-augment/src/parachain/interfaces/augment-api-errors.ts
@@ -866,6 +866,11 @@ declare module "@polkadot/api-base/types/errors" {
        * Local XCM execution incomplete.
        **/
       LocalExecutionIncomplete: AugmentedError<ApiType>;
+      /**
+       * Local XCM execution incomplete with the actual XCM error and the index of the
+       * instruction that caused the error.
+       **/
+      LocalExecutionIncompleteWithError: AugmentedError<ApiType>;
       /**
        * A remote lock with the corresponding data could not be found.
        **/

diff --git a/api-augment/src/parachain/interfaces/augment-api-events.ts b/api-augment/src/parachain/interfaces/augment-api-events.ts
@@ -2054,6 +2054,11 @@ declare module "@polkadot/api-base/types/events" {
       [key: string]: AugmentedEvent<ApiType>;
     };
     session: {
+      /**
+       * The `NewSession` event in the current block also implies a new validator set to be
+       * queued.
+       **/
+      NewQueued: AugmentedEvent<ApiType, []>;
       /**
        * New session has happened. Note that the argument is the session index, not the
        * block number as the type might suggest.

diff --git a/api-augment/src/parachain/interfaces/augment-api-runtime.ts b/api-augment/src/parachain/interfaces/augment-api-runtime.ts
@@ -21,7 +21,6 @@ import type { AnyNumber, IMethod, ITuple } from "@polkadot/types-codec/types";
 import type { CheckInherentsResult, InherentData } from "@polkadot/types/interfaces/blockbuilder";
 import type { BlockHash } from "@polkadot/types/interfaces/chain";
 import type { AuthorityId } from "@polkadot/types/interfaces/consensus";
-import type { CollationInfo } from "@polkadot/types/interfaces/cumulus";
 import type {
   CallDryRunEffects,
   XcmDryRunApiError,
@@ -173,32 +172,6 @@ declare module "@polkadot/api-base/types/calls" {
        **/
       [key: string]: DecoratedCallBase<ApiType>;
     };
-    /** 0xea93e3f16f3d6962/2 */
-    collectCollationInfo: {
-      /**
-       * Collect information about a collation.
-       **/
-      collectCollationInfo: AugmentedCall<
-        ApiType,
-        (
-          header:
-            | Header
-            | {
-                parentHash?: any;
-                number?: any;
-                stateRoot?: any;
-                extrinsicsRoot?: any;
-                digest?: any;
-              }
-            | string
-            | Uint8Array
-        ) => Observable<CollationInfo>
-      >;
-      /**
-       * Generic call
-       **/
-      [key: string]: DecoratedCallBase<ApiType>;
-    };
     /** 0xdf6acb689907609b/5 */
     core: {
       /**

diff --git a/api-augment/src/parachain/interfaces/augment-api-tx.ts b/api-augment/src/parachain/interfaces/augment-api-tx.ts
@@ -2017,6 +2017,8 @@ declare module "@polkadot/api-base/types/submittable" {
                 relayChainState?: any;
                 downwardMessages?: any;
                 horizontalMessages?: any;
+                relayParentDescendants?: any;
+                collatorPeerId?: any;
               }
             | string
             | Uint8Array

diff --git a/api-augment/src/parachain/interfaces/registry.ts b/api-augment/src/parachain/interfaces/registry.ts
@@ -170,6 +170,7 @@ import type {
   PalletXcmAuthorizedAliasesEntry,
   PalletXcmCall,
   PalletXcmError,
+  PalletXcmErrorsExecutionError,
   PalletXcmEvent,
   PalletXcmHoldReason,
   PalletXcmMaxAuthorizedAliases,
@@ -236,6 +237,7 @@ import type {
   SpRuntimeDigest,
   SpRuntimeDigestDigestItem,
   SpRuntimeDispatchError,
+  SpRuntimeHeader,
   SpRuntimeModuleError,
   SpRuntimeMultiSignature,
   SpRuntimeProvingTrieTrieError,
@@ -284,6 +286,7 @@ import type {
   StagingXcmV5PalletInfo,
   StagingXcmV5QueryResponseInfo,
   StagingXcmV5Response,
+  StagingXcmV5TraitsInstructionError,
   StagingXcmV5TraitsOutcome,
   StagingXcmV5Xcm,
   XcmDoubleEncoded,
@@ -485,6 +488,7 @@ declare module "@polkadot/types/types/registry" {
     PalletXcmAuthorizedAliasesEntry: PalletXcmAuthorizedAliasesEntry;
     PalletXcmCall: PalletXcmCall;
     PalletXcmError: PalletXcmError;
+    PalletXcmErrorsExecutionError: PalletXcmErrorsExecutionError;
     PalletXcmEvent: PalletXcmEvent;
     PalletXcmHoldReason: PalletXcmHoldReason;
     PalletXcmMaxAuthorizedAliases: PalletXcmMaxAuthorizedAliases;
@@ -551,6 +555,7 @@ declare module "@polkadot/types/types/registry" {
     SpRuntimeDigest: SpRuntimeDigest;
     SpRuntimeDigestDigestItem: SpRuntimeDigestDigestItem;
     SpRuntimeDispatchError: SpRuntimeDispatchError;
+    SpRuntimeHeader: SpRuntimeHeader;
     SpRuntimeModuleError: SpRuntimeModuleError;
     SpRuntimeMultiSignature: SpRuntimeMultiSignature;
     SpRuntimeProvingTrieTrieError: SpRuntimeProvingTrieTrieError;
@@ -599,6 +604,7 @@ declare module "@polkadot/types/types/registry" {
     StagingXcmV5PalletInfo: StagingXcmV5PalletInfo;
     StagingXcmV5QueryResponseInfo: StagingXcmV5QueryResponseInfo;
     StagingXcmV5Response: StagingXcmV5Response;
+    StagingXcmV5TraitsInstructionError: StagingXcmV5TraitsInstructionError;
     StagingXcmV5TraitsOutcome: StagingXcmV5TraitsOutcome;
     StagingXcmV5Xcm: StagingXcmV5Xcm;
     XcmDoubleEncoded: XcmDoubleEncoded;

diff --git a/api-augment/src/solochain-evm/interfaces/augment-api-events.ts b/api-augment/src/solochain-evm/interfaces/augment-api-events.ts
@@ -686,6 +686,20 @@ declare module "@polkadot/api-base/types/events" {
        **/
       [key: string]: AugmentedEvent<ApiType>;
     };
+    historical: {
+      /**
+       * The merkle roots of up to this session index were pruned
+       **/
+      RootsPruned: AugmentedEvent<ApiType, [upTo: u32], { upTo: u32 }>;
+      /**
+       * The merkle root of the validators of the said session were stored
+       **/
+      RootStored: AugmentedEvent<ApiType, [index: u32], { index: u32 }>;
+      /**
+       * Generic event
+       **/
+      [key: string]: AugmentedEvent<ApiType>;
+    };
     nfts: {
       /**
        * All approvals of an item got cancelled.
@@ -1599,6 +1613,11 @@ declare module "@polkadot/api-base/types/events" {
       [key: string]: AugmentedEvent<ApiType>;
     };
     session: {
+      /**
+       * The `NewSession` event in the current block also implies a new validator set to be
+       * queued.
+       **/
+      NewQueued: AugmentedEvent<ApiType, []>;
       /**
        * New session has happened. Note that the argument is the session index, not the
        * block number as the type might suggest.

diff --git a/api-augment/src/solochain-evm/interfaces/registry.ts b/api-augment/src/solochain-evm/interfaces/registry.ts
@@ -160,6 +160,7 @@ import type {
   PalletSessionCall,
   PalletSessionError,
   PalletSessionEvent,
+  PalletSessionHistoricalPalletEvent,
   PalletStorageProvidersBackupStorageProvider,
   PalletStorageProvidersBucket,
   PalletStorageProvidersCall,
@@ -415,6 +416,7 @@ declare module "@polkadot/types/types/registry" {
     PalletSessionCall: PalletSessionCall;
     PalletSessionError: PalletSessionError;
     PalletSessionEvent: PalletSessionEvent;
+    PalletSessionHistoricalPalletEvent: PalletSessionHistoricalPalletEvent;
     PalletStorageProvidersBackupStorageProvider: PalletStorageProvidersBackupStorageProvider;
     PalletStorageProvidersBucket: PalletStorageProvidersBucket;
     PalletStorageProvidersCall: PalletStorageProvidersCall;

diff --git a/client/blockchain-service/src/utils.rs b/client/blockchain-service/src/utils.rs
@@ -1368,6 +1368,24 @@ where
         } else if let Some(tx) = self.transaction_manager.pending.get_mut(&nonce) {
             // Only update status if this is the current transaction
             if tx.hash == tx_hash {
+                // Detect implicit retraction by fatxpool (fork-aware transaction pool).
+                // fatxpool intentionally suppresses Retracted events (polkadot-sdk#5479).
+                // When a second InBlock arrives for a different block hash, it means the
+                // original block was reorged out and the tx was re-included in a new fork
+                // block.
+                if let TransactionStatus::InBlock((ref new_block, _)) = status {
+                    if let TransactionStatus::InBlock((ref old_block, _)) = tx.latest_status {
+                        if old_block != new_block {
+                            warn!(
+                                target: LOG_TARGET,
+                                "🔄 Transaction with nonce {} was implicitly retracted and re-included in block: {:?} \
+                                (previously in block: {:?}). This is expected fatxpool behavior during reorgs.",
+                                nonce, new_block, old_block
+                            );
+                        }
+                    }
+                }
+
                 debug!(
                     target: LOG_TARGET,
                     "📊 Transaction with nonce {} (hash: {:?}) status updated: {:?}",

diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs
@@ -46,7 +46,6 @@ use sp_blockchain::HeaderBackend;
 use sp_core::{sr25519::Pair as Sr25519Pair, Encode, Pair};
 use sp_keystore::{Keystore, KeystorePtr};
 use sp_runtime::{Deserialize, KeyTypeId, Serialize};
-use sp_runtime_interface::pass_by::PassByInner;
 
 pub mod remote_file;
 use remote_file::{RemoteFileConfig, RemoteFileHandlerFactory};
@@ -655,7 +654,7 @@ where
 
         // Remove all files with the given prefix from the file storage.
         write_file_storage
-            .delete_files_with_prefix(&prefix.inner())
+            .delete_files_with_prefix(&prefix.0)
             .map_err(into_rpc_error)?;
 
         info!(

diff --git a/node/src/command.rs b/node/src/command.rs
@@ -374,12 +374,12 @@ pub fn run() -> Result<()> {
                         let partials = new_partial_parachain(&config, dev_service)?;
                         let db = partials.backend.expose_db();
                         let storage = partials.backend.expose_storage();
-                        cmd.run(config, partials.client.clone(), db, storage)
+                        cmd.run(config, partials.client.clone(), db, storage, None)
                     } else if config.chain_spec.is_solochain_evm() {
                         let partials = new_partial_solochain_evm(&config, dev_service)?;
                         let db = partials.backend.expose_db();
                         let storage = partials.backend.expose_storage();
-                        cmd.run(config, partials.client.clone(), db, storage)
+                        cmd.run(config, partials.client.clone(), db, storage, None)
                     } else {
                         unreachable!("Invalid chain spec")
                     }